fix a bug for back button in firefox
Merge branch 'master' into gh-pages