Snapshot from SVN
Build/Nuget fixes