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