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