Fix year in LICENSE
Merge branch 'origin/master'