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