Fix bug: chrome extension not work.
Merge branch 'master' into change-to-nodejs