chg: git-flow: Encorporate 'hotfixes' in 'fixes'
Merge branch 'feature/git-flow-support' into develop