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