Updated version 2.5 from 'upstream/2.5'
authorgregor herrmann <gregoa@debian.org>
Fri, 23 Jun 2017 15:08:10 +0000 (17:08 +0200)
committergregor herrmann <gregoa@debian.org>
Fri, 23 Jun 2017 15:08:10 +0000 (17:08 +0200)
with Debian dir 6b8bd231271adbeb19d94cc66a8a10f80e27de76


Trivial merge