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