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