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