Merge pull request #868 from neheb/4