Fix nuget problem.
Merge branch 'nuget'