Merge in backpublished 1.9.6 changelog (#97)