3.11/sprint scheduling v2

Gabriel Schlozer requested to merge 3.11/sprint-scheduling-v2 into 3.11/sprint Jan 23, 2019