Branched off of 20130301 commit
Merge branch 'master' into asynch
Module caching change via pjw