Fix the broken tests
Update the copyright year
Merge branch 'master' into gh-pages