Merge branch 'release/1.0' into develop
Merge branch 'hotfix/cname' into develop
after deploy
Merge branch 'develop'

* develop:
  after deploy