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