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