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