Merge tag 'upstream/3.014'
authorgregor herrmann <gregoa@debian.org>
Mon, 7 Dec 2015 14:31:16 +0000 (15:31 +0100)
committergregor herrmann <gregoa@debian.org>
Mon, 7 Dec 2015 14:31:16 +0000 (15:31 +0100)
Upstream version 3.014


Trivial merge