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