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