committing a test script and some changes to a script backing class that caused a null pointer exception under some conditions
Merge remote-tracking branch 'origin/master'