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