Merge pull request #874 from bittorf/master