Merge branch 'master_MDL-43011' of git://github.com/danmarsden/moodle