Update copyright year

No functional change.
Merge remote-tracking branch 'upstream/master'