Update to latest jslib/canvas.js
Merge branch 'master' into gh-pages

* master:
  Update to latest jslib/canvas.js