Merge branch 'MDL-41492-master' of https://github.com/peterburnett/moodle