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