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