Merge branch 'CAT-1086' of github.com:Catrobat/Catroid into CAT-1086
Merge branch 'CAT-1086' of github.com:Catrobat/Catroid into CAT-1086