merge
authorRobert Kaiser <kairo@kairo.at>
Tue, 17 May 2016 10:02:15 +0000 (12:02 +0200)
committerRobert Kaiser <kairo@kairo.at>
Tue, 17 May 2016 10:02:15 +0000 (12:02 +0200)

Trivial merge