Merge branch 'sim'
authorClifford Wolf <clifford@clifford.at>
Fri, 18 Aug 2017 09:45:15 +0000 (11:45 +0200)
committerClifford Wolf <clifford@clifford.at>
Fri, 18 Aug 2017 09:45:15 +0000 (11:45 +0200)

Trivial merge