Merge remote-tracking branch 'origin/develop'
Merge branch 'release-1.0'
Merge branch 'develop'