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