SERVER-14471 Fix build break with the Visual Studio 2013 Update 2 toolkit
Merge remote-tracking branch 'upstream/master'