Merge branch 'smtbmc-kmanfi'
authorClifford Wolf <clifford@clifford.at>
Fri, 2 Sep 2016 11:55:51 +0000 (13:55 +0200)
committerClifford Wolf <clifford@clifford.at>
Fri, 2 Sep 2016 11:55:51 +0000 (13:55 +0200)

Trivial merge