Fix the test failures in issue 759.
Merge pull request #763 from warsaw/issue759

Fix the test failures in issue 759.
Add Barry's contribution to the CHANGELOG.