Merging some files back to upstream versions.