Merge a piece of a pull request, change copyright, add contributor