Merge branch 'stable-2.6' into stable-2.7

* stable-2.6:
  Fix: Performance issue when traversing large Git repositories

Change-Id: I1078171ef584831a4cca92a08c4cc570d163db8d