Merge branch '2016.11-sambaad' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 25 Jan 2017 15:06:52 +0000 (16:06 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 25 Jan 2017 15:06:52 +0000 (16:06 +0100)

Trivial merge