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