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