An important note re: hotfix branches