Merge pull request #929 from bittorf/master