Index: ext/gmock/gmock.vcxproj
===================================================================
diff -u -N -r122f5f17f602b989c626ab31bb7f32c4211f93bd -r6103ac74583f2136b821dc67515ed8469abd8155
--- ext/gmock/gmock.vcxproj	(.../gmock.vcxproj)	(revision 122f5f17f602b989c626ab31bb7f32c4211f93bd)
+++ ext/gmock/gmock.vcxproj	(.../gmock.vcxproj)	(revision 6103ac74583f2136b821dc67515ed8469abd8155)
@@ -119,61 +119,61 @@
     <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\</IntDir>
     <TargetName>$(ProjectName)32d</TargetName>
-    <IncludePath>C:\dev\boost_1_57_0;$(IncludePath)</IncludePath>
-    <LibraryPath>C:\dev\boost_1_57_0\lib-12.0\x32\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>C:\dev\boost_1_58_0;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\dev\boost_1_58_0\lib-12.0\x32\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing Debug|Win32'">
     <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\</IntDir>
     <TargetName>$(ProjectName)32d</TargetName>
-    <IncludePath>C:\dev\boost_1_57_0;$(IncludePath)</IncludePath>
-    <LibraryPath>C:\dev\boost_1_57_0\lib-12.0\x32\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>C:\dev\boost_1_58_0;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\dev\boost_1_58_0\lib-12.0\x32\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\</IntDir>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
     <TargetName>$(ProjectName)64d</TargetName>
-    <IncludePath>C:\dev\boost_1_57_0;$(IncludePath)</IncludePath>
-    <LibraryPath>C:\dev\boost_1_57_0\lib-12.0\x64\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>C:\dev\boost_1_58_0;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\dev\boost_1_58_0\lib-12.0\x64\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing Debug|x64'">
     <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\</IntDir>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
     <TargetName>$(ProjectName)64d</TargetName>
-    <IncludePath>C:\dev\boost_1_57_0;$(IncludePath)</IncludePath>
-    <LibraryPath>C:\dev\boost_1_57_0\lib-12.0\x64\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>C:\dev\boost_1_58_0;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\dev\boost_1_58_0\lib-12.0\x64\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\</IntDir>
     <TargetName>$(ProjectName)32</TargetName>
-    <IncludePath>C:\dev\boost_1_57_0;$(IncludePath)</IncludePath>
-    <LibraryPath>C:\dev\boost_1_57_0\lib-12.0\x32\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>C:\dev\boost_1_58_0;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\dev\boost_1_58_0\lib-12.0\x32\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing Release|Win32'">
     <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\</IntDir>
     <TargetName>$(ProjectName)32</TargetName>
-    <IncludePath>C:\dev\boost_1_57_0;$(IncludePath)</IncludePath>
-    <LibraryPath>C:\dev\boost_1_57_0\lib-12.0\x32\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>C:\dev\boost_1_58_0;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\dev\boost_1_58_0\lib-12.0\x32\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\</IntDir>
     <TargetName>$(ProjectName)64</TargetName>
-    <IncludePath>C:\dev\boost_1_57_0;$(IncludePath)</IncludePath>
-    <LibraryPath>C:\dev\boost_1_57_0\lib-12.0\x64\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>C:\dev\boost_1_58_0;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\dev\boost_1_58_0\lib-12.0\x64\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Testing Release|x64'">
     <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)intermediate\vc120\$(Platform)\$(ProjectName)_$(Configuration)\</IntDir>
     <TargetName>$(ProjectName)64</TargetName>
-    <IncludePath>C:\dev\boost_1_57_0;$(IncludePath)</IncludePath>
-    <LibraryPath>C:\dev\boost_1_57_0\lib-12.0\x64\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>C:\dev\boost_1_58_0;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\dev\boost_1_58_0\lib-12.0\x64\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>