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