Merge changes from Tramp repository