Fix name in copyright to be in accordance with newest upstream.
Merge branch 'master' into devel