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