Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 3 Apr 2017 19:42:23 +0000 (21:42 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 3 Apr 2017 19:42:23 +0000 (21:42 +0200)
Change-Id: I3335561b3da64b13cb8ca92bd1c12d5ca66e7a91


Trivial merge