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