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