Update CHANGES.rst

Update for PR #1171 and #961.