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