annual copyright update
Automatic merging of dev into master

* dev:
  annual copyright update