Merge branch 'maintenance/copyright-2019' into 'develop'