Add '--always' to 'git describe'
Add gitCommit to version resource
Merge branch 'master' into sasl