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