Merge remote-tracking branch 'public/bug9645' into maint-0.2.4
Merge remote-tracking branch 'origin/maint-0.2.4'