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