Merge pull request #879 from bittorf/master