Imported Upstream version 1.0+git3ba9f1cc
Merge tag 'upstream/1.0+git3ba9f1cc'

Upstream version 1.0+git3ba9f1cc
Update copyright
Use canonical Vcs urls
Update changelog