Merge branch 'master' into 2.0-development
Merge branch '2.0-development' into expose-current-scheduler