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