even though it's temporary, try to boost shape drawing performace
Merge branch 'master' into gh-pages
update