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