Merge branch 'MDL-41664_master' of https://github.com/markn86/moodle