Merge branch 'release/2.0' into develop
Back-merging 2.0 into develop
Version 3.0 update to readme
Merge branch 'release/3.0'
Merge RC to master for 3.0