Merge branch 'js-restart'
Update Title
Merge branch 'master' into gh-pages