Version bump and changelog update
Merge branch 'master' of github.com:zedapp/zed