Merge pull request #1 from rmangalore/temp

Sayed - we need this for the Custom Scaffolding Template release.