Codename: Salty peas

** This is a quick release for the pass-the-salt conference to make @xarkes and Cutter happy. **

Expect 2.7.0 release with proper release notes, testing and bug fixes in a week.