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