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