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