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