Merge branch 'm19_MDL-25770_hotpotfix' of git://github.com/danmarsden/moodle into...