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