diff --git a/Spring.build b/Spring.build
index 0843474d..ceea3b31 100644
--- a/Spring.build
+++ b/Spring.build
@@ -140,7 +140,7 @@ Commandline Examples:
   
   <property name="test.withcoverage" value="false" overwrite="true" />
   <!-- what coverage tool to use: ncover or opencover -->
-  <property name="test.coverage.tool" value="ncover" overwrite="false" />
+  <property name="test.coverage.tool" value="opencover" overwrite="false" />
 
   <!-- import non-redistributables if available -->
   <!-- to build certain libraries (e.g. Spring.Messaging.Ems), 3rd party libraries are required
@@ -403,7 +403,6 @@ Commandline Examples:
     <nant buildfile="src/Spring/Spring.Aop/Spring.Aop.build" target="build" if="${build-aop}"/>
     <nant buildfile="src/Spring/Spring.Web/Spring.Web.build" target="build" if="${build-web}"/>
     <nant buildfile="src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build" target="build" if="${build-web and (nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'mono-2.0')}"/>
-    <nant buildfile="src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.build" target="build" if="${nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0'}"/>
     <nant buildfile="src/Spring/Spring.Web.Mvc3/Spring.Web.Mvc3.build" target="build" if="${nant.settings.currentframework == 'net-4.0'}"/>
 	<nant buildfile="src/Spring/Spring.Web.Mvc4/Spring.Web.Mvc4.build" target="build" if="${nant.settings.currentframework == 'net-4.0'}"/>
     <nant buildfile="src/Spring/Spring.Data/Spring.Data.build" target="build" if="${build-data}"/>
@@ -437,7 +436,6 @@ Commandline Examples:
 	
     <nant buildfile="test/Spring/Spring.Services.Tests/Spring.Services.Tests.build" target="test" if="${build-services}"/>
     <nant buildfile="test/Spring/Spring.Web.Tests/Spring.Web.Tests.build" target="test" if="${build-web}"/>
-	<nant buildfile="test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.build" target="test" if="${build-web and (nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0')}"/>
 	<nant buildfile="test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.build" target="test" if="${build-web and nant.settings.currentframework == 'net-4.0'}"/>
 	<nant buildfile="test/Spring/Spring.Web.Mvc4.Tests/Spring.Web.Mvc4.Tests.build" target="test" if="${build-web and nant.settings.currentframework == 'net-4.0'}"/>
     <nant buildfile="test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build" target="test" if="${build-testing-nunit}"/>
@@ -697,8 +695,6 @@ Commandline Examples:
         <delete dir="src/Spring/Spring.Web/bin" failonerror="false"/>
         <delete dir="src/Spring/Spring.Web.Extensions/obj" failonerror="false"/>
         <delete dir="src/Spring/Spring.Web.Extensions/bin" failonerror="false"/>
-        <delete dir="src/Spring/Spring.Web.Mvc/obj"  failonerror="false"/>
-        <delete dir="src/Spring/Spring.Web.Mvc/bin"  failonerror="false"/>
         <delete dir="src/Spring/Spring.Web.Mvc3/obj" failonerror="false"/>
         <delete dir="src/Spring/Spring.Web.Mvc3/bin" failonerror="false"/>
         <delete dir="src/Spring/Spring.Web.Mvc4/obj" failonerror="false"/>
@@ -712,8 +708,6 @@ Commandline Examples:
         <delete dir="test/Spring/Spring.Messaging.Ems.Integration.Tests/bin" failonerror="false"/>
         <delete dir="test/Spring/Spring.Scheduling.Quartz21.Integration.Tests/obj" failonerror="false"/>
         <delete dir="test/Spring/Spring.Scheduling.Quartz21.Integration.Tests/bin" failonerror="false"/>
-        <delete dir="test/Spring/Spring.Web.Mvc.Tests/obj" failonerror="false"/>
-        <delete dir="test/Spring/Spring.Web.Mvc.Tests/bin" failonerror="false"/>
         <delete dir="test/Spring/Spring.Web.Mvc3.Tests/obj"  failonerror="false"/>
         <delete dir="test/Spring/Spring.Web.Mvc3.Tests/bin"  failonerror="false"/>
         <delete dir="test/Spring/Spring.Web.Mvc4.Tests/obj"  failonerror="false"/>
@@ -781,8 +775,6 @@ Commandline Examples:
             <include name="*.pdb"/> 
           </fileset>           
         </delete>   
-        <delete dir="test/Spring/Spring.Web.Mvc.Tests/obj" failonerror="false"/>
-        <delete dir="test/Spring/Spring.Web.Mvc.Tests/bin" failonerror="false"/>
         <delete dir="test/Spring/Spring.Web.Mvc3.Tests/obj"  failonerror="false"/>
         <delete dir="test/Spring/Spring.Web.Mvc3.Tests/bin"  failonerror="false"/>
         <delete dir="test/Spring/Spring.Web.Mvc4.Tests/obj"  failonerror="false"/>
@@ -1377,10 +1369,6 @@ Commandline Examples:
           <include name="*/*/Spring.Web.xml"/>
           <include name="*/*/Spring.Web.pdb"/>
 		  
-		  <include name="*/*/Spring.Web.Mvc.dll"/>
-          <include name="*/*/Spring.Web.Mvc.xml"/>
-          <include name="*/*/Spring.Web.Mvc.pdb"/>
-		  
 		  <include name="*/*/Spring.Web.Mvc3.dll"/>
           <include name="*/*/Spring.Web.Mvc3.xml"/>
           <include name="*/*/Spring.Web.Mvc3.pdb"/>
@@ -1448,10 +1436,6 @@ Commandline Examples:
 			<include name="*/*/Spring.Scheduling.Quartz21.xml"/>
 			<include name="*/*/Spring.Scheduling.Quartz21.pdb"/>
 			
-			<include name="*/Spring.Web.Mvc.dll"/>
-            <include name="*/Spring.Web.Mvc.xml"/>
-            <include name="*/Spring.Web.Mvc.pdb"/>
-			
 			<include name="*/Spring.Web.Extensions.dll"/>
             <include name="*/Spring.Web.Extensions.xml"/>
             <include name="*/Spring.Web.Extensions.pdb"/>
@@ -1645,7 +1629,6 @@ Commandline Examples:
       <include name="src/Spring/Spring.Core/**"/>
       <include name="src/Spring/Spring.Aop/**"/>
       <include name="src/Spring/Spring.Web/**"/>
-      <include name="src/Spring/Spring.Web.Mvc/**"/>
       <include name="src/Spring/Spring.Web.Mvc3/**"/>
 	  <include name="src/Spring/Spring.Web.Mvc4/**"/>
       <include name="src/Spring/Spring.Web.Extensions/**"/>
@@ -1667,7 +1650,6 @@ Commandline Examples:
       <include name="test/Spring/Spring.Core.Tests/**"/>
       <include name="test/Spring/Spring.Aop.Tests/**"/>
       <include name="test/Spring/Spring.Web.Tests/**"/>
-	  <include name="test/Spring/Spring.Web.Mvc.Tests/**"/>
 	  <include name="test/Spring/Spring.Web.Mvc3.Tests/**"/>
 	  <include name="test/Spring/Spring.Web.Mvc4.Tests/**"/>
       <include name="test/Spring/Spring.Services.Tests/**"/>
diff --git a/build-support/tools/OpenCover/Autofac.Configuration.dll b/build-support/tools/OpenCover/Autofac.Configuration.dll
new file mode 100644
index 00000000..07c1afc9
Binary files /dev/null and b/build-support/tools/OpenCover/Autofac.Configuration.dll differ
diff --git a/build-support/tools/OpenCover/Autofac.dll b/build-support/tools/OpenCover/Autofac.dll
new file mode 100644
index 00000000..36555f23
Binary files /dev/null and b/build-support/tools/OpenCover/Autofac.dll differ
diff --git a/build-support/tools/OpenCover/Gendarme.Framework.dll b/build-support/tools/OpenCover/Gendarme.Framework.dll
index 1b795d1d..23a47af5 100644
Binary files a/build-support/tools/OpenCover/Gendarme.Framework.dll and b/build-support/tools/OpenCover/Gendarme.Framework.dll differ
diff --git a/build-support/tools/OpenCover/Gendarme.Rules.Maintainability.dll b/build-support/tools/OpenCover/Gendarme.Rules.Maintainability.dll
index 02137713..340c1877 100644
Binary files a/build-support/tools/OpenCover/Gendarme.Rules.Maintainability.dll and b/build-support/tools/OpenCover/Gendarme.Rules.Maintainability.dll differ
diff --git a/build-support/tools/OpenCover/License.txt b/build-support/tools/OpenCover/License.txt
deleted file mode 100644
index 1647e735..00000000
--- a/build-support/tools/OpenCover/License.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2011 Shaun Wilde
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/build-support/tools/OpenCover/Microsoft.Practices.Unity.dll b/build-support/tools/OpenCover/Microsoft.Practices.Unity.dll
deleted file mode 100644
index 84f1870d..00000000
Binary files a/build-support/tools/OpenCover/Microsoft.Practices.Unity.dll and /dev/null differ
diff --git a/build-support/tools/OpenCover/Mono.Cecil.Pdb.dll b/build-support/tools/OpenCover/Mono.Cecil.Pdb.dll
index a917d34a..75787ad6 100644
Binary files a/build-support/tools/OpenCover/Mono.Cecil.Pdb.dll and b/build-support/tools/OpenCover/Mono.Cecil.Pdb.dll differ
diff --git a/build-support/tools/OpenCover/Mono.Cecil.dll b/build-support/tools/OpenCover/Mono.Cecil.dll
index bd4773e1..b0691e85 100644
Binary files a/build-support/tools/OpenCover/Mono.Cecil.dll and b/build-support/tools/OpenCover/Mono.Cecil.dll differ
diff --git a/build-support/tools/OpenCover/OpenCover.Console.exe b/build-support/tools/OpenCover/OpenCover.Console.exe
index 1932f633..0a816af1 100644
Binary files a/build-support/tools/OpenCover/OpenCover.Console.exe and b/build-support/tools/OpenCover/OpenCover.Console.exe differ
diff --git a/build-support/tools/OpenCover/OpenCover.Console.exe.config b/build-support/tools/OpenCover/OpenCover.Console.exe.config
index cf4f561e..fc5b859b 100644
--- a/build-support/tools/OpenCover/OpenCover.Console.exe.config
+++ b/build-support/tools/OpenCover/OpenCover.Console.exe.config
@@ -1,8 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-	
-	<startup>
-		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
-	</startup>
-
-</configuration>
+  <configSections>
+    <section name="autofac" type="Autofac.Configuration.SectionHandler, Autofac.Configuration"/>
+  </configSections>
+  <autofac>
+    <modules>
+      <module type="OpenCover.Extensions.RegisterStrategiesModule, OpenCover.Extensions" />
+    </modules>
+  </autofac>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
+  </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Mono.Cecil" publicKeyToken="0738eb9f132ed756" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-0.9.5.0" newVersion="0.9.5.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/build-support/tools/OpenCover/OpenCover.Extensions.dll b/build-support/tools/OpenCover/OpenCover.Extensions.dll
new file mode 100644
index 00000000..bb8511c7
Binary files /dev/null and b/build-support/tools/OpenCover/OpenCover.Extensions.dll differ
diff --git a/build-support/tools/OpenCover/OpenCover.Framework.dll b/build-support/tools/OpenCover/OpenCover.Framework.dll
index 4bc9497d..9b1669de 100644
Binary files a/build-support/tools/OpenCover/OpenCover.Framework.dll and b/build-support/tools/OpenCover/OpenCover.Framework.dll differ
diff --git a/build-support/tools/OpenCover/x64/OpenCover.Profiler.dll b/build-support/tools/OpenCover/x64/OpenCover.Profiler.dll
index 55a61378..335c4382 100644
Binary files a/build-support/tools/OpenCover/x64/OpenCover.Profiler.dll and b/build-support/tools/OpenCover/x64/OpenCover.Profiler.dll differ
diff --git a/build-support/tools/OpenCover/x86/OpenCover.Profiler.dll b/build-support/tools/OpenCover/x86/OpenCover.Profiler.dll
index 1803fe62..32cb8e48 100644
Binary files a/build-support/tools/OpenCover/x86/OpenCover.Profiler.dll and b/build-support/tools/OpenCover/x86/OpenCover.Profiler.dll differ
diff --git a/build-support/tools/ReportGenerator/Readme.txt b/build-support/tools/ReportGenerator/Readme.txt
index 55f56a10..a070fb56 100644
--- a/build-support/tools/ReportGenerator/Readme.txt
+++ b/build-support/tools/ReportGenerator/Readme.txt
@@ -12,34 +12,31 @@
 DESCRIPTION
 
 ReportGenerator converts XML reports generated by PartCover, OpenCover
-or NCover into a readable HTML report. 
-In contrast to the XSLT-Transformation included in PartCover, the 
-report is more detailed.
-It does not only show the coverage quota, but also includes the source 
-code and visualizes which line has been covered.
+or NCover into a readable report in various formats. 
+The reports do not only show the coverage quota, but also include the
+source code and visualize which line has been covered.
 
 ReportGenerator supports merging several reports into one.
-If you pass several reports to ReportGenerator, the reports will be
-merged into one.
 It is also possible to pass one XML file containing several reports to
 ReportGenerator (e.g. a build log file).
 
-Several output formats are supported by ReportGenerator. The following
-report types can be generated:
+The following output formats are supported by ReportGenerator:
 
 -HTML, HTMLSummary
 -XML, XMLSummary
 -Latex, LatexSummary
 
-=======================================================================
-
-COMPATIBILITY
+Compatibility:
 
 OpenCover
 PartCover 4.0
 PartCover 2.2, 2.3
+Visual Studio (vstest.console.exe, CodeCoverage.exe)
 NCover (tested version 1.5.8, other versions may not work)
 
+Also available as NuGet package:
+http://nuget.org/List/Packages/ReportGenerator
+
 =======================================================================
 
 LICENSE
@@ -54,6 +51,131 @@ For further details take a look at LICENSE.txt.
 
 CHANGELOG
 
+1.9.1.0
+
+    * Fix: Improved naming of HTML report files
+
+1.9.0.0
+
+    * New: Added support for Visual Studio coverage reports
+           (CodeCoverage.exe)
+
+1.8.1.0
+
+    * Fix: Issue #9988: Completely empty classes now show correct
+           coverage
+
+1.8.0.0
+
+    * New: Issue #9891: Aggregation of results by namespace
+    * New: Issue #9875: More details and sorting possiblity in summary
+           report
+    * New: Issue #9913: Mark of complete line according to coverage
+    * New: Issue #9935: In HTMLSummary static text instead of link is
+           rendered
+    * New: Issue #9937: HTMLSummary now is a self containing report
+           without external CSS or JavaScript
+
+1.7.3.0
+
+    * New: Issue #9833: Version command line parameter
+    * Fix: Issue #9886: Compatibility for OpenCover 4.0.1229
+
+1.7.2.0
+
+    * Fix: Issue #9736: NCover 1.5.8 Exclude attribute is not handled
+    * Fix: Issue #9773: Ignored casing in directory search
+
+1.7.1.0
+
+    * Fix: Issue #9706: Trailing slashes in command line arguments
+
+1.7.0.0
+
+    * New: Issue #9698: Added "coverbytest" support of OpenCover
+    * Fix: Issue #9671: Reduced length of report filenames
+    * Fix: Reports can now be located in an UNC path
+
+1.6.1.0
+
+    * Fix: Issue #9646: Unhandled IO-Exception when source directories
+           are supplied
+
+1.6.0.0
+
+    * New: Added support for Visual Studio coverage reports
+           (vstest.console.exe)
+    * New: Issue #9534: Added support for wildcards in report file
+           pattern
+    * Fix: OpenCoverParser supports coverage for methods that 'yield'
+           the result
+
+1.5.0.0
+
+    * Fix: Improved merging of metrics (now using full signature)
+    * Fix: Reduced memory usage during report generation
+
+1.4.1.0
+
+    * New: Added verbosity switch
+    * New: Added possibility to generate several output formats at once
+
+1.4.0.0
+
+    * Fix: Issue #9372: Reduced memory usage
+
+1.3.0.0
+
+    * New: Added more report preprocessing to deal with auto properties
+           and source files that don't appear in OpenCover/PartCover
+           reports
+    * New: Added possibility to filter assemblies
+
+1.2.7.0
+
+    * Fix: Issue #9266: Improved performance
+
+1.2.6.0
+
+    * Fix: Issue #9141: Handling of same assembly in different
+           directories in OpenCoverParser
+
+1.2.5.0
+
+    * New: Excluded ignored classes from OpenCoverParser
+
+1.2.4.0
+
+    * Fix: Issue #9065: Rounding of coverage quota down to the last
+           significant figure
+    * Fix: Issue #9041: Merging reports doesn't work when the same
+           module is used from different paths
+
+1.2.3.0
+
+    * Fix: Issue #8992: Improved HTML Summary (collapsing of classes)
+
+1.2.2.0
+
+    * Fix: Issue #8931: Improved layout of Html reports
+    * Fix: Issue #8958: Coverage for types with no sequence points
+    * Fix: Issue #8936: Additional statistics for assemblies
+
+1.2.1.0
+
+    * Fix: Issue #8653: NCover - OutOfMemoryException on a seqpoint with
+           a magic line
+    * Fix: Improved layout of Latex reports
+
+1.2.0.0
+
+    * New: Added support for OpenCover metrics
+    * New: Added support for AutoProperties in OpenCover/PartCover
+
+1.1.1.0
+
+    * Fix: Reports now saved with more unique filename
+
 1.1.0.0
 
     * New: Added support for OpenCover
@@ -112,11 +234,4 @@ CHANGELOG
 
 0.1.0.0
 
-    * New: Initial release
-
-=======================================================================
-
-KNOWN ISSUES
-
-The reports generated by PartCover do not contain enough information to
-correctly get the coverage of 'Auto Properties'.
\ No newline at end of file
+    * New: Initial release
\ No newline at end of file
diff --git a/build-support/tools/ReportGenerator/bin/ICSharpCode.NRefactory.dll b/build-support/tools/ReportGenerator/bin/ICSharpCode.NRefactory.dll
index aefe1529..01cfd44f 100644
Binary files a/build-support/tools/ReportGenerator/bin/ICSharpCode.NRefactory.dll and b/build-support/tools/ReportGenerator/bin/ICSharpCode.NRefactory.dll differ
diff --git a/build-support/tools/ReportGenerator/bin/Readme.txt b/build-support/tools/ReportGenerator/bin/Readme.txt
index 69aef056..a070fb56 100644
--- a/build-support/tools/ReportGenerator/bin/Readme.txt
+++ b/build-support/tools/ReportGenerator/bin/Readme.txt
@@ -31,7 +31,7 @@ Compatibility:
 OpenCover
 PartCover 4.0
 PartCover 2.2, 2.3
-Visual Studio
+Visual Studio (vstest.console.exe, CodeCoverage.exe)
 NCover (tested version 1.5.8, other versions may not work)
 
 Also available as NuGet package:
@@ -51,6 +51,41 @@ For further details take a look at LICENSE.txt.
 
 CHANGELOG
 
+1.9.1.0
+
+    * Fix: Improved naming of HTML report files
+
+1.9.0.0
+
+    * New: Added support for Visual Studio coverage reports
+           (CodeCoverage.exe)
+
+1.8.1.0
+
+    * Fix: Issue #9988: Completely empty classes now show correct
+           coverage
+
+1.8.0.0
+
+    * New: Issue #9891: Aggregation of results by namespace
+    * New: Issue #9875: More details and sorting possiblity in summary
+           report
+    * New: Issue #9913: Mark of complete line according to coverage
+    * New: Issue #9935: In HTMLSummary static text instead of link is
+           rendered
+    * New: Issue #9937: HTMLSummary now is a self containing report
+           without external CSS or JavaScript
+
+1.7.3.0
+
+    * New: Issue #9833: Version command line parameter
+    * Fix: Issue #9886: Compatibility for OpenCover 4.0.1229
+
+1.7.2.0
+
+    * Fix: Issue #9736: NCover 1.5.8 Exclude attribute is not handled
+    * Fix: Issue #9773: Ignored casing in directory search
+
 1.7.1.0
 
     * Fix: Issue #9706: Trailing slashes in command line arguments
@@ -69,6 +104,7 @@ CHANGELOG
 1.6.0.0
 
     * New: Added support for Visual Studio coverage reports
+           (vstest.console.exe)
     * New: Issue #9534: Added support for wildcards in report file
            pattern
     * Fix: OpenCoverParser supports coverage for methods that 'yield'
diff --git a/build-support/tools/ReportGenerator/bin/ReportGenerator.exe b/build-support/tools/ReportGenerator/bin/ReportGenerator.exe
index ac0b1c0e..4d28343d 100644
Binary files a/build-support/tools/ReportGenerator/bin/ReportGenerator.exe and b/build-support/tools/ReportGenerator/bin/ReportGenerator.exe differ