Merge branch 'MDL-47918-master' of git://github.com/andrewnicols/moodle