Fix parse_git_dirty() when status.branch is set.
Fix POST_1_7_2_GIT check for parse_git_dirty submodules.
2928 merge conflict
Merge branch 'simonbuchan-master'