Merge branch 'MDL-53072_master' of git://github.com/markn86/moodle