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