Merge beta to master for 0.8.0 release