Fix copyright year
Merge pull request #955
Merge pull request #955 in master