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