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