Fix script uri in previous commit.
Merge branch 'master' into gh-pages