Imported upstream version 2.4.1
Merge tag 'upstream/2.4.1'

Upstream version 2.4.1
Package new upstream release and bump standards version
Imported upstream version 2.5
Merge tag 'upstream/2.5'

Upstream version 2.5
Release new upstream version