Merge tag 'upstream/2.3.0'
authorAndreas Tille <tille@debian.org>
Tue, 12 Apr 2016 12:52:46 +0000 (14:52 +0200)
committerAndreas Tille <tille@debian.org>
Tue, 12 Apr 2016 12:52:46 +0000 (14:52 +0200)
Upstream version 2.3.0


Trivial merge