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