Adjust year of copyright notice
Merge branch 'stable'