Tweak Unicorn settings [ci skip]
Merge master into release [ci skip]