Update copyright
Merge branch 'master' into 1.1
Fix