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