Merge rebased branch 'MDL-25769' of git://github.com/andyjdavis/moodle.git