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