Merge branch 'klammerj-master'
authorClifford Wolf <clifford@clifford.at>
Sat, 25 Feb 2017 15:36:23 +0000 (16:36 +0100)
committerClifford Wolf <clifford@clifford.at>
Sat, 25 Feb 2017 15:36:23 +0000 (16:36 +0100)

Trivial merge