trying to fix broken canvas resize on android
Merge branch 'master' into gh-pages