Updated version 0.12.0+ds from 'upstream/0.12.0+ds'
authorAndreas Tille <tille@debian.org>
Tue, 29 Aug 2017 20:51:44 +0000 (22:51 +0200)
committerAndreas Tille <tille@debian.org>
Tue, 29 Aug 2017 20:51:44 +0000 (22:51 +0200)
with Debian dir 6aee94dbe15c4663e14bd3849d2a988c9eaf4b2a


Trivial merge