Merge branch 'MDL-41291-master' of git://github.com/mr-russ/moodle