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