Merge pull request #3569 from eht16/bump_version_to_2_0