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