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