Squashed 'wicker/' changes from cb02809..e435af3

e435af3 general fixes and improvements

git-subtree-dir: wicker
git-subtree-split: e435af38e578892e63800bdc314ffc78c5ccff66
wicker merge
general fixes and improvements