Avoid setting SCRIPT to empty string
Merge pull request #1707 from jbence/feature/fix-script-env-value

Avoid setting SCRIPT to empty string
Merge remote-tracking branch 'upstream/master'