Merge remote-tracking branch 'upstream/master' into debian-fixes
authorIOhannes m zmölnig <zmoelnig@umlautQ.umlaeute.mur.at>
Tue, 10 Oct 2017 14:00:15 +0000 (16:00 +0200)
committerIOhannes m zmölnig <zmoelnig@umlautQ.umlaeute.mur.at>
Tue, 10 Oct 2017 14:00:15 +0000 (16:00 +0200)

Trivial merge