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