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