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