Merge branch 'MDL-51863' of git://github.com/stronk7/moodle