fix console error on firefox
Merge branch 'master' into gh-pages