Squashed 'wicker/' changes from dfb762c..890d948

890d948 lockandkey

git-subtree-dir: wicker
git-subtree-split: 890d948011c144b77ad253e73be23783b1568ff6
(wicker) custom locks and keys support