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