Merge branch 'MDL-41380-master' of https://github.com/mr-russ/moodle