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