Merge branch 'tk/ambiguous-fetch-refspec'