Moodle 25 master development

Dear Julian,

This should bring the master branch up to date with Moodle 2.5 development.

Cheers,

Gareth