Merge beta to master for 0.9.1 release

Please see changelog.md