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