copyright update
merge conflict
Merge pull request #1862 from jlsherrill/copyright

copyright update