Merge remote-tracking branch 'teor/bug27463-029' into maint-0.2.9