Merge beta to master for 0.9.7 release