Update from orig SVN At revision: 2385
Merge branch 'DwScript_orig'