Merge branch 'MDL-46123' of https://github.com/stronk7/moodle