Canvas fixes for firefox
Merge remote-tracking branch 'upstream/wip' into upstream_wip
toPage fixes
Merge pull request #5 from Checksum/upstream_wip

Upstream wip