Merge branch 'master' into ansible-fixup
authornicoo <nicoo@realraum.at>
Fri, 17 Nov 2017 13:15:08 +0000 (14:15 +0100)
committernicoo <nicoo@realraum.at>
Fri, 17 Nov 2017 13:15:08 +0000 (14:15 +0100)

Trivial merge