Trying to fix android freeze
TestX
Merge branch 'master' into gh-pages