Merge tag 'upstream/2.4'
authorgregor herrmann <gregoa@debian.org>
Sun, 27 Nov 2016 18:24:43 +0000 (19:24 +0100)
committergregor herrmann <gregoa@debian.org>
Sun, 27 Nov 2016 18:24:43 +0000 (19:24 +0100)
Upstream version 2.4


Trivial merge