Merge branch 'ticket-10527' into develop

This commit is contained in:
Marion Muszynski 2016-08-31 14:57:19 +02:00
commit 72a0d2d3d7