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