Cherry-pick "Merge branch 'TestUpdates-master-20180313' into 'master'" into 1.0

Test Updates, master branch (2018.03.13.)

See merge request !253 (merged)

(cherry picked from commit 4d315de6)

• ae7f96b9 As Frank pointed out, relative paths in a script don't refer to paths relative to the
• 5027bbe8 Added quotes around the script name to allow for spaces in the source