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