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