abusing android fix
Merge branch 'master' into deploy
fixed orphaned exceptions
Merge branch 'master' into deploy