Merge tag 'upstream/0.6.2'
authorgregor herrmann <gregoa@debian.org>
Tue, 24 Jan 2017 17:51:17 +0000 (18:51 +0100)
committergregor herrmann <gregoa@debian.org>
Tue, 24 Jan 2017 17:51:17 +0000 (18:51 +0100)
Upstream version 0.6.2


Trivial merge