Changed year in copyright
Merge branch 'master' into bb