Merge pull request #685 from jrblevin/issue-684