Bump copyright year
Merge branch '1.2'