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