Merge branch 'stv0g-master'
authorClifford Wolf <clifford@clifford.at>
Sat, 11 Feb 2017 09:20:10 +0000 (10:20 +0100)
committerClifford Wolf <clifford@clifford.at>
Sat, 11 Feb 2017 09:20:10 +0000 (10:20 +0100)

Trivial merge