Merge pull request #867 from neheb/3