Remove make-release branch after switching back
Merge branch 'develop'