Merge branch 'MDL-38404-m' of https://github.com/andrewnicols/moodle