Merge pull request #788 from jrblevin/issue/787