Nuget 2.5 danliu

Fix issue https://github.com/NuGet/NuGetDocs/issues/85

and issue https://github.com/NuGet/NuGetDocs/issues/86