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