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