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