Add Sig's stackforge changes here.
Merge pull request #560 from jfwood/verify-resource

Add Sig's stackforge changes here.