Merge branch 'MDL-25695-master' of https://github.com/mackensen/moodle