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