Imported Upstream version 2.5
Merge tag 'upstream/2.5'

Upstream version 2.5
Package new upstream version.
Bump standards version and release it.
Merge pull request #4 from juw/changes

Changes