Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5