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