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