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