Squashed 'wicker/' changes from 165d15b..30d49e8

30d49e8 Label method wrapping fix

git-subtree-dir: wicker
git-subtree-split: 30d49e87f5318866e117dada9b71e1e6eae9be89
wicker merge
minor tweaks