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