#807 - start of git-flow