Merge branch 'gitshaversion'