Fix tfs bug 672646
Merge branch 'master' of https://git01.codeplex.com/aspnetwebstack