Merge release 0.9.6 (2nd try).