Updated version 1.2.7 from 'upstream/1.2.7'
authorSven Hoexter <sven@stormbind.net>
Sun, 25 Jun 2017 10:15:01 +0000 (12:15 +0200)
committerSven Hoexter <sven@stormbind.net>
Sun, 25 Jun 2017 10:15:01 +0000 (12:15 +0200)
with Debian dir ce777bfeb1d4ec5a3e818d5e8996187acbd71bfa


Trivial merge