Merge release 0.9.6.