Changed nmssmManual back to before Tony's changes
Merge branch 'master' into officialTag