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