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