Merge pull request #1121 from gavinandresen/scripttest