Merge pull request #960 from gavinandresen/issue913