Release 2.0.0
Merge branch 'master' into develop