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