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