Fixing an urgent bug in scripts.js.
Merge branch 'Master' into new-feature