Latest Solo fixes
Merge branch 'master' of https://github.com/algobardo/Catroid