Bring version number and copyright years up to date
Merge branch 'hotfix/fix_version'