fixes #8559
Merge pull request #20 from twitter/3.0.0-wip

fixes #8559