Squashed 'wicker/' changes from a12cde1..c6eb6df

c6eb6df included missing files

git-subtree-dir: wicker
git-subtree-split: c6eb6dfa8927e67264b7a0f6d2ea5a4593f6b080
(wicker) included missing files