Merge remote-tracking branch 'mikeperry/bug6475' into maint-0.2.3