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