Xavier merge

See https://github.com/NuGet/NuGetGallery/pull/765#issuecomment-13265149