Merge branch 'trackingStatus'

Conflicts:
	src/main/groovy/org/ajoberstar/gradle/git/util/GitUtil.groovy