Leftover from ff0b7a679570cc3a3374cea4fa693d4ef60def7c
Merge branch '1.3'
CS fixes
Bump copyright year
Merge branch '1.3'