Cleanup
Merge branch '1.3'
Remove deprecated functionality
Bump copyright year
Merge branch '1.3'