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