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