Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 2 Aug 2017 11:35:47 +0000 (13:35 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 2 Aug 2017 11:35:47 +0000 (13:35 +0200)
Change-Id: I1d01234788761638587e2629ff57385789203afd


Trivial merge