Merge branch 'vlogpp-inc-fixes'
authorClifford Wolf <clifford@clifford.at>
Tue, 26 Sep 2017 12:02:57 +0000 (14:02 +0200)
committerClifford Wolf <clifford@clifford.at>
Tue, 26 Sep 2017 12:02:57 +0000 (14:02 +0200)

Trivial merge