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