Update to nuget packages and merge master