Merge remote-tracking branch 'asn/nickm-bug12864_025' into maint-0.2.5