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