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