Merge remote-tracking branch 'rransom-tor/bug4251-022' into maint-0.2.2