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