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