Imported Upstream version 2.2
Merge branch 'upstream' of github.com:formorer/pkg-ferm into upstream