on demand release 2.5beta+

Special 'Spoons curry' UK Edition ;-)
Merge branch 'wip-MDL-39196-master' of github.com:ds125v/moodle into wip-MDL-39196-master