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