Merge branch 'master' into develop
Updated licence year.
Merge branch 'develop'