Release 0.9.6 merge to master