NT changes
Merge branch 'newmodules'
Merge branch 'master' into jeff-norman
Incorporating NT changes