Squashed 'wicker/' changes from b91e1ec..b2e18ee

b2e18ee a whole bunch of DST compatibility code

git-subtree-dir: wicker
git-subtree-split: b2e18eee117f374243311d3fbf678f354cca8106
wicker merge
There's so much stuff I don't even.