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