Merge branch 'wip-mdl-51424' of https://github.com/dthies/moodle