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