Squashed 'wicker/' changes from 3d6f287..3bd2d28

3bd2d28 Some improvements on how to handle module encapsulation

git-subtree-dir: wicker
git-subtree-split: 3bd2d286b4c65ec21895a67e5903ddb33271ebc6
wicker improvements to prevent clashes with other mods using wicker.