Squashed 'wicker/' changes from 2b0a751..e7c8eeb

e7c8eeb bug fixes

git-subtree-dir: wicker
git-subtree-split: e7c8eebcfd13f84e6615f8d45c6609fbe5521ff0
Bug fixes in wicker.