Changelog 0.7-beta4
Merge remote-tracking branch 'origin/dev' into beta