Merge branch 'dh73-master'
authorClifford Wolf <clifford@clifford.at>
Tue, 3 Oct 2017 15:33:43 +0000 (17:33 +0200)
committerClifford Wolf <clifford@clifford.at>
Tue, 3 Oct 2017 15:33:43 +0000 (17:33 +0200)

Trivial merge