Merge branch 'master' into permission-vertical

Change-Id: Idefd5b3fd9356effe1d1f779bb87801251f718f7
This commit is contained in:
Axel Uhl committed 2018-09-14 13:09:13 +02:00
commit 895151c21f
1 file changed