#807 - start of git-flow
#807 - start of git-flow
start of work on 3.6