Merge branch 'MDL-37872-m' of git://github.com/andrewnicols/moodle