Merge pull request #1223 from claycompton/staging

This is the set of QA changes in the current iteration, ready to be added to Staging
Merge remote-tracking branch 'nuget/staging'