Merge tag 'upstream/3.008'
authorgregor herrmann <gregoa@debian.org>
Sun, 29 Nov 2015 14:04:25 +0000 (15:04 +0100)
committergregor herrmann <gregoa@debian.org>
Sun, 29 Nov 2015 14:04:25 +0000 (15:04 +0100)
Upstream version 3.008


Trivial merge