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