Fix js error
Merge branch 'master' into ghpage-update