Merge pull request #150 from Smoss/master

Regression Test Fix
Merge branch 'master' into zipmodule