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