Merge branch 'pu/2013.10-containergrouping'
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 17:11:15 +0000 (19:11 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 17:11:15 +0000 (19:11 +0200)

Trivial merge