True. In all cases I need to merge Colin's copyright changes in that branch. I will update