Merge tag 'upstream/3.006'
authorgregor herrmann <gregoa@debian.org>
Mon, 16 Nov 2015 20:51:59 +0000 (21:51 +0100)
committergregor herrmann <gregoa@debian.org>
Mon, 16 Nov 2015 20:51:59 +0000 (21:51 +0100)
Upstream version 3.006


Trivial merge