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