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