Catch up copyrights post-merge.