Merge branch 'MDL-26649_master' of https://github.com/markn86/moodle