Merge branch 'jc/extended-fake-ancestor-for-gitlink'