Merge pull request #3953 from rolfbjarne/offsets-tool-autoreclone