Merge pull request #489 from mhaskel/2.0.0-prep