Merge branch 'MDL-55007-master' of https://github.com/dthies/moodle