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