chg: git-flow: Encorporate 'hotfixes' in 'fixes'