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