Merge branch 'release/1.0'
Merge branch 'release/2.0'
Merge branch 'master' into develop

* master: