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