Merge branch 'MDL-51718-set-scheme' of https://github.com/brendanheywood/moodle