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