diff --git a/src/ImageProcessor.Web/NET4/ImageProcessor.Web.csproj b/src/ImageProcessor.Web/NET4/ImageProcessor.Web.csproj
index 94a9adf8f..c5ff34b28 100644
--- a/src/ImageProcessor.Web/NET4/ImageProcessor.Web.csproj
+++ b/src/ImageProcessor.Web/NET4/ImageProcessor.Web.csproj
@@ -61,15 +61,12 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.IO">
-      <HintPath>..\..\packages\Microsoft.Bcl.1.1.3\lib\net40\System.IO.dll</HintPath>
-    </Reference>
     <Reference Include="System.Net" />
     <Reference Include="System.Runtime">
-      <HintPath>..\..\packages\Microsoft.Bcl.1.1.3\lib\net40\System.Runtime.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Bcl.1.0.19\lib\net40\System.Runtime.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks">
-      <HintPath>..\..\packages\Microsoft.Bcl.1.1.3\lib\net40\System.Threading.Tasks.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Bcl.1.0.19\lib\net40\System.Threading.Tasks.dll</HintPath>
     </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Data" />
diff --git a/src/ImageProcessor.Web/NET4/packages.config b/src/ImageProcessor.Web/NET4/packages.config
index e526037bf..72b52ba35 100644
--- a/src/ImageProcessor.Web/NET4/packages.config
+++ b/src/ImageProcessor.Web/NET4/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Csharp-Sqlite" version="3.7.7.1" targetFramework="net40" />
-  <package id="Microsoft.Bcl" version="1.1.3" targetFramework="net40" />
+  <package id="Microsoft.Bcl" version="1.0.19" targetFramework="net40" />
   <package id="Microsoft.Bcl.Async" version="1.0.16" targetFramework="net40" />
   <package id="Microsoft.Bcl.Build" version="1.0.8" targetFramework="net40" />
   <package id="sqlite-net" version="1.0.7" targetFramework="net40" />
diff --git a/src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs b/src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs
index 475842401..e6083400a 100644
--- a/src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs
+++ b/src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.3.0.2")]
-[assembly: AssemblyFileVersion("2.3.0.2")]
+[assembly: AssemblyVersion("2.3.0.4")]
+[assembly: AssemblyFileVersion("2.3.0.4")]
diff --git a/src/ImageProcessor/Processors/Watermark.cs b/src/ImageProcessor/Processors/Watermark.cs
index f5900fde9..25b449987 100644
--- a/src/ImageProcessor/Processors/Watermark.cs
+++ b/src/ImageProcessor/Processors/Watermark.cs
@@ -24,50 +24,50 @@ namespace ImageProcessor.Processors
     /// </summary>
     public class Watermark : IGraphicsProcessor
     {
-/// <summary>
-/// The regular expression to search strings for.
-/// </summary>
-private static readonly Regex QueryRegex = new Regex(@"watermark=[^&]*", RegexOptions.Compiled);
-
-/// <summary>
-/// The regular expression to search strings for the text attribute.
-/// </summary>
-private static readonly Regex TextRegex = new Regex(@"text-[^/:?#\[\]@!$&'()*%\|,;=]+", RegexOptions.Compiled);
-
-/// <summary>
-/// The regular expression to search strings for the position attribute.
-/// </summary>
-private static readonly Regex PositionRegex = new Regex(@"position-\d+-\d+", RegexOptions.Compiled);
-
-/// <summary>
-/// The regular expression to search strings for the color attribute.
-/// </summary>
-private static readonly Regex ColorRegex = new Regex(@"color-([0-9a-fA-F]{3}){1,2}", RegexOptions.Compiled);
-
-/// <summary>
-/// The regular expression to search strings for the font size attribute.
-/// </summary>
-private static readonly Regex FontSizeRegex = new Regex(@"size-\d{1,3}", RegexOptions.Compiled);
-
-/// <summary>
-/// The regular expression to search strings for the font style attribute.
-/// </summary>
-private static readonly Regex FontStyleRegex = new Regex(@"style-(bold|italic|regular|strikeout|underline)", RegexOptions.Compiled);
-
-/// <summary>
-/// The regular expression to search strings for the font family attribute.
-/// </summary>
-private static readonly Regex FontFamilyRegex = new Regex(@"font-[^/:?#\[\]@!$&'()*%\|,;=0-9]+", RegexOptions.Compiled);
-
-/// <summary>
-/// The regular expression to search strings for the opacity attribute.
-/// </summary>
-private static readonly Regex OpacityRegex = new Regex(@"opacity-(?:100|[1-9]?[0-9])", RegexOptions.Compiled);
-
-/// <summary>
-/// The regular expression to search strings for the shadow attribute.
-/// </summary>
-private static readonly Regex ShadowRegex = new Regex(@"shadow-true", RegexOptions.Compiled);
+        /// <summary>
+        /// The regular expression to search strings for.
+        /// </summary>
+        private static readonly Regex QueryRegex = new Regex(@"watermark=[^&]*", RegexOptions.Compiled);
+
+        /// <summary>
+        /// The regular expression to search strings for the text attribute.
+        /// </summary>
+        private static readonly Regex TextRegex = new Regex(@"text-[^/:?#\[\]@!$&'()*%\|,;=]+", RegexOptions.Compiled);
+
+        /// <summary>
+        /// The regular expression to search strings for the position attribute.
+        /// </summary>
+        private static readonly Regex PositionRegex = new Regex(@"position-\d+-\d+", RegexOptions.Compiled);
+
+        /// <summary>
+        /// The regular expression to search strings for the color attribute.
+        /// </summary>
+        private static readonly Regex ColorRegex = new Regex(@"color-([0-9a-fA-F]{3}){1,2}", RegexOptions.Compiled);
+
+        /// <summary>
+        /// The regular expression to search strings for the font size attribute.
+        /// </summary>
+        private static readonly Regex FontSizeRegex = new Regex(@"size-\d{1,3}", RegexOptions.Compiled);
+
+        /// <summary>
+        /// The regular expression to search strings for the font style attribute.
+        /// </summary>
+        private static readonly Regex FontStyleRegex = new Regex(@"style-(bold|italic|regular|strikeout|underline)", RegexOptions.Compiled);
+
+        /// <summary>
+        /// The regular expression to search strings for the font family attribute.
+        /// </summary>
+        private static readonly Regex FontFamilyRegex = new Regex(@"font-[^/:?#\[\]@!$&'()*%\|,;=0-9]+", RegexOptions.Compiled);
+
+        /// <summary>
+        /// The regular expression to search strings for the opacity attribute.
+        /// </summary>
+        private static readonly Regex OpacityRegex = new Regex(@"opacity-(?:100|[1-9]?[0-9])", RegexOptions.Compiled);
+
+        /// <summary>
+        /// The regular expression to search strings for the shadow attribute.
+        /// </summary>
+        private static readonly Regex ShadowRegex = new Regex(@"shadow-true", RegexOptions.Compiled);
 
         #region IGraphicsProcessor Members
         /// <summary>
@@ -173,7 +173,7 @@ private static readonly Regex ShadowRegex = new Regex(@"shadow-true", RegexOptio
 
             try
             {
-                // Dont use an object initializer here.
+                // Don't use an object initializer here.
                 newImage = new Bitmap(image);
                 newImage.Tag = image.Tag;
 
@@ -193,12 +193,12 @@ private static readonly Regex ShadowRegex = new Regex(@"shadow-true", RegexOptio
                             {
                                 Point origin = textLayer.Position;
 
+                                // Work out the size of the text.
+                                SizeF textSize = graphics.MeasureString(text, font, new SizeF(image.Width, image.Height), drawFormat);
+
                                 // We need to ensure that there is a position set for the watermark
                                 if (origin == Point.Empty)
                                 {
-                                    // Work out the size of the text.
-                                    SizeF textSize = graphics.MeasureString(text, font, new SizeF(image.Width, image.Height), drawFormat);
-
                                     int x = (int)(image.Width - textSize.Width) / 2;
                                     int y = (int)(image.Height - textSize.Height) / 2;
                                     origin = new Point(x, y);
@@ -207,6 +207,9 @@ private static readonly Regex ShadowRegex = new Regex(@"shadow-true", RegexOptio
                                 // Set the hinting and draw the text.
                                 graphics.TextRenderingHint = TextRenderingHint.AntiAliasGridFit;
 
+                                // Create bounds for the text.
+                                RectangleF bounds;
+
                                 if (textLayer.DropShadow)
                                 {
                                     // Shadow opacity should change with the base opacity.
@@ -219,11 +222,18 @@ private static readonly Regex ShadowRegex = new Regex(@"shadow-true", RegexOptio
                                         // Magic number but it's based on artistic preference.
                                         int shadowDiff = (int)Math.Ceiling(fontSize / 24f);
                                         Point shadowPoint = new Point(origin.X + shadowDiff, origin.Y + shadowDiff);
-                                        graphics.DrawString(text, font, shadowBrush, shadowPoint, drawFormat);
+
+                                        // Set the bounds so any overlapping text will wrap.
+                                        bounds = new RectangleF(shadowPoint, new SizeF(image.Width - shadowPoint.X, image.Height - shadowPoint.Y));
+
+                                        graphics.DrawString(text, font, shadowBrush, bounds, drawFormat);
                                     }
                                 }
 
-                                graphics.DrawString(text, font, brush, origin, drawFormat);
+                                // Set the bounds so any overlapping text will wrap.
+                                bounds = new RectangleF(origin, new SizeF(image.Width - origin.X, image.Height - origin.Y));
+
+                                graphics.DrawString(text, font, brush, bounds, drawFormat);
                             }
                         }
                     }
diff --git a/src/ImageProcessor/Properties/AssemblyInfo.cs b/src/ImageProcessor/Properties/AssemblyInfo.cs
index 68075c37d..7e9e403f3 100644
--- a/src/ImageProcessor/Properties/AssemblyInfo.cs
+++ b/src/ImageProcessor/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@ using System.Security;
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.7.0.1")]
-[assembly: AssemblyFileVersion("1.7.0.1")]
+[assembly: AssemblyVersion("1.7.0.2")]
+[assembly: AssemblyFileVersion("1.7.0.2")]
 
diff --git a/src/Nuget/ImageProcessor.1.7.0.2.nupkg b/src/Nuget/ImageProcessor.1.7.0.2.nupkg
new file mode 100644
index 000000000..7d0ffca1c
Binary files /dev/null and b/src/Nuget/ImageProcessor.1.7.0.2.nupkg differ
diff --git a/src/Nuget/ImageProcessor.Web.2.3.0.1.nupkg.REMOVED.git-id b/src/Nuget/ImageProcessor.Web.2.3.0.1.nupkg.REMOVED.git-id
deleted file mode 100644
index 71aa309d9..000000000
--- a/src/Nuget/ImageProcessor.Web.2.3.0.1.nupkg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-8a839fc32a168bcddd1bd9043d64e9502bab4e99
\ No newline at end of file
diff --git a/src/Nuget/ImageProcessor.Web.2.3.0.2.nupkg.REMOVED.git-id b/src/Nuget/ImageProcessor.Web.2.3.0.2.nupkg.REMOVED.git-id
deleted file mode 100644
index 10b435c4e..000000000
--- a/src/Nuget/ImageProcessor.Web.2.3.0.2.nupkg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-8c5a374f583194706fa94a269f7ab4543dc4ece6
\ No newline at end of file
diff --git a/src/Nuget/ImageProcessor.Web.2.3.0.4.nupkg.REMOVED.git-id b/src/Nuget/ImageProcessor.Web.2.3.0.4.nupkg.REMOVED.git-id
new file mode 100644
index 000000000..ea6008fcb
--- /dev/null
+++ b/src/Nuget/ImageProcessor.Web.2.3.0.4.nupkg.REMOVED.git-id
@@ -0,0 +1 @@
+129834a775acc5e2bfe85dc7db9edd37b9219e43
\ No newline at end of file
diff --git a/src/Nuget/ImageProcessor.Web.2.3.0.5.nupkg.REMOVED.git-id b/src/Nuget/ImageProcessor.Web.2.3.0.5.nupkg.REMOVED.git-id
new file mode 100644
index 000000000..7b70614ce
--- /dev/null
+++ b/src/Nuget/ImageProcessor.Web.2.3.0.5.nupkg.REMOVED.git-id
@@ -0,0 +1 @@
+9d6097d930bbf60f2d333f80e7c916759a3c3f0c
\ No newline at end of file
diff --git a/src/Nuget/imageprocessor.128.png b/src/Nuget/imageprocessor.128.png
index 0cea636f8..cd6f911c9 100644
--- a/src/Nuget/imageprocessor.128.png
+++ b/src/Nuget/imageprocessor.128.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:594e72bfc3c1804871e083684e8927f92b9619c5b42855b8a530556ce037d356
-size 5724
+oid sha256:d4e936585d0857f7c38a3c70e9dd5d2414a84af39db30b0be698bc151d7a9225
+size 6510
diff --git a/src/TestWebsites/NET4/Images/Penguins-8.png.REMOVED.git-id b/src/TestWebsites/NET4/Images/Penguins-8.png.REMOVED.git-id
new file mode 100644
index 000000000..aa9a70e0f
--- /dev/null
+++ b/src/TestWebsites/NET4/Images/Penguins-8.png.REMOVED.git-id
@@ -0,0 +1 @@
+c3d556d9d486b8b8b49cdbcc9c12a9d3a2db4c1f
\ No newline at end of file
diff --git a/src/TestWebsites/NET4/Images/Penguins.tif.REMOVED.git-id b/src/TestWebsites/NET4/Images/Penguins.tif.REMOVED.git-id
new file mode 100644
index 000000000..5f7b97e71
--- /dev/null
+++ b/src/TestWebsites/NET4/Images/Penguins.tif.REMOVED.git-id
@@ -0,0 +1 @@
+c789aaec248568c24394b05c02db4233e0c5a4eb
\ No newline at end of file
diff --git a/src/TestWebsites/NET4/Test_Website.csproj b/src/TestWebsites/NET4/Test_Website.csproj
index c21b57c22..831c5d096 100644
--- a/src/TestWebsites/NET4/Test_Website.csproj
+++ b/src/TestWebsites/NET4/Test_Website.csproj
@@ -88,16 +88,28 @@
     <Content Include="Content\responsive.min.css" />
     <Content Include="Global.asax" />
     <Content Include="Images\1182076_e8c402e938_z.jpg" />
+    <Content Include="Images\Chrysanthemum.jpg" />
+    <Content Include="Images\color-vision-test.gif" />
     <Content Include="Images\Desert.jpg" />
+    <Content Include="Images\fid11246.jpg" />
+    <Content Include="Images\fid9141.jpg" />
+    <Content Include="Images\Hydrangeas.jpg" />
+    <Content Include="Images\Jellyfish.jpg" />
+    <Content Include="Images\jrt.jpg" />
+    <Content Include="Images\Koala.jpg" />
     <Content Include="Images\Lighthouse.jpg" />
+    <Content Include="Images\lomo.jpg" />
     <Content Include="Images\MSwanson - Wide Large - Rock 02.jpg" />
     <Content Include="Images\negative.png" />
     <Content Include="Images\negative2.png" />
+    <Content Include="Images\Penguins-8.png" />
     <Content Include="Images\Penguins.bmp" />
     <Content Include="Images\Penguins.gif" />
     <Content Include="Images\Penguins.jpg" />
     <Content Include="Images\Penguins.png" />
+    <Content Include="Images\Penguins.tif" />
     <Content Include="Images\Tulips.jpg" />
+    <Content Include="Images\udendørs.jpg" />
     <Content Include="Images\war_horse_quad.jpg" />
     <Content Include="Scripts\img.srcsect.pollyfill.js" />
     <Content Include="Web.config">
diff --git a/src/TestWebsites/NET4/Views/Home/Index.cshtml b/src/TestWebsites/NET4/Views/Home/Index.cshtml
index 8e99ec374..2efa21511 100644
--- a/src/TestWebsites/NET4/Views/Home/Index.cshtml
+++ b/src/TestWebsites/NET4/Views/Home/Index.cshtml
@@ -308,6 +308,102 @@
         </div>
     </section>
 </article>
+<article>
+    <h1>Png8</h1>
+    <section>
+        <div class="row">
+            <div class="column-6">
+                <h2>Resized</h2>
+                <img src="/images/Penguins-8.png?width=300" />
+            </div>
+            <div class="column-6">
+                <h2>Cropped </h2>
+                <img src="/images/Penguins-8.png?crop=0-0-300-225" />
+            </div>
+        </div>
+    </section>
+    <section>
+        <h2>Filter</h2>
+        <div class="row">
+            <div class="column-6">
+                <h3>blackwhite</h3>
+                <img src="/images/Penguins-8.png?width=300&filter=blackwhite" />
+            </div>
+            <div class="column-6">
+                <h3>comic</h3>
+                <img src="/images/Penguins-8.png?width=300&filter=comic" />
+            </div>
+        </div>
+        <div class="row">
+            <div class="column-6">
+                <h3>lomograph</h3>
+                <img src="/images/Penguins-8.png?width=300&filter=lomograph" />
+            </div>
+            <div class="column-6">
+                <h3>greyscale</h3>
+                <img src="/images/Penguins-8.png?width=300&filter=greyscale" />
+            </div>
+        </div>
+        <div class="row">
+            <div class="column-6">
+                <h3>polaroid</h3>
+                <img src="/images/Penguins-8.png?width=300&filter=polaroid" />
+            </div>
+            <div class="column-6">
+                <h3>sepia</h3>
+                <img src="/images/Penguins-8.png?width=300&filter=sepia" />
+            </div>
+        </div>
+        <div class="row">
+            <div class="column-6">
+                <h3>gotham</h3>
+                <img src="/images/Penguins-8.png?width=300&filter=gotham" />
+            </div>
+            <div class="column-6">
+                <h3>hisatch</h3>
+                <img src="/images/Penguins-8.png?width=300&filter=hisatch" />
+            </div>
+        </div>
+        <div class="row">
+            <div class="column-6">
+                <h3>losatch</h3>
+                <img src="/images/Penguins-8.png?width=300&filter=losatch" />
+            </div>
+        </div>
+    </section>
+    <section>
+        <div class="row">
+            <div class="column-6">
+                <h2>Watermark</h2>
+                <img src="/images/Penguins-8.png?width=300&watermark=text-test|color-fff|size-48|style-italic|opacity-100|position-100-100|shadow-true|font-arial" />
+            </div>
+            <div class="column-6">
+                <h2>Format</h2>
+                <img src="/images/Penguins-8.png?width=300&format=bmp" />
+            </div>
+        </div>
+    </section>
+    <section>
+        <div class="row">
+            <div class="column-6">
+                <h2>Rotate</h2>
+                <img src="/images/Penguins-8.png?width=300&rotate=angle-54|bgcolor-fff" />
+            </div>
+            <div class="column-6">
+                <h2>Quality</h2>
+                <img src="/images/Penguins-8.png?width=300&quality=5" />
+            </div>
+        </div>
+    </section>
+    <section>
+        <div class="row">
+            <div class="column-6">
+                <h2>Alpha</h2>
+                <img src="/images/Penguins-8.png?width=300&alpha=50" />
+            </div>
+        </div>
+    </section>
+</article>
 <article>
     <h1>Bmp</h1>
     <section>
@@ -404,3 +500,99 @@
         </div>
     </section>
 </article>
+<article>
+    <h1>Tiff</h1>
+    <section>
+        <div class="row">
+            <div class="column-6">
+                <h2>Resized</h2>
+                <img src="/images/Penguins.tif?width=300" />
+            </div>
+            <div class="column-6">
+                <h2>Cropped </h2>
+                <img src="/images/Penguins.tif?crop=0-0-300-225" />
+            </div>
+        </div>
+    </section>
+    <section>
+        <h2>Filter</h2>
+        <div class="row">
+            <div class="column-6">
+                <h3>blackwhite</h3>
+                <img src="/images/Penguins.tif?width=300&filter=blackwhite" />
+            </div>
+            <div class="column-6">
+                <h3>comic</h3>
+                <img src="/images/Penguins.tif?width=300&filter=comic" />
+            </div>
+        </div>
+        <div class="row">
+            <div class="column-6">
+                <h3>lomograph</h3>
+                <img src="/images/Penguins.tif?width=300&filter=lomograph" />
+            </div>
+            <div class="column-6">
+                <h3>greyscale</h3>
+                <img src="/images/Penguins.tif?width=300&filter=greyscale" />
+            </div>
+        </div>
+        <div class="row">
+            <div class="column-6">
+                <h3>polaroid</h3>
+                <img src="/images/Penguins.tif?width=300&filter=polaroid" />
+            </div>
+            <div class="column-6">
+                <h3>sepia</h3>
+                <img src="/images/Penguins.tif?width=300&filter=sepia" />
+            </div>
+        </div>
+        <div class="row">
+            <div class="column-6">
+                <h3>gotham</h3>
+                <img src="/images/Penguins.tif?width=300&filter=gotham" />
+            </div>
+            <div class="column-6">
+                <h3>hisatch</h3>
+                <img src="/images/Penguins.tif?width=300&filter=hisatch" />
+            </div>
+        </div>
+        <div class="row">
+            <div class="column-6">
+                <h3>losatch</h3>
+                <img src="/images/Penguins.tif?width=300&filter=losatch" />
+            </div>
+        </div>
+    </section>
+    <section>
+        <div class="row">
+            <div class="column-6">
+                <h2>Watermark</h2>
+                <img src="/images/Penguins.tif?width=300&watermark=text-test|color-fff|size-48|style-italic|opacity-100|position-100-100|shadow-true|font-arial" />
+            </div>
+            <div class="column-6">
+                <h2>Format</h2>
+                <img src="/images/Penguins.tif?width=300&format=bmp" />
+            </div>
+        </div>
+    </section>
+    <section>
+        <div class="row">
+            <div class="column-6">
+                <h2>Rotate</h2>
+                <img src="/images/Penguins.tif?width=300&rotate=angle-54|bgcolor-fff" />
+            </div>
+            <div class="column-6">
+                <h2>Quality</h2>
+                <img src="/images/Penguins.tif?width=300&quality=5" />
+            </div>
+        </div>
+    </section>
+    <section>
+        <div class="row">
+            <div class="column-6">
+                <h2>Alpha</h2>
+                <img src="/images/Penguins.tif?width=300&alpha=50" />
+            </div>
+        </div>
+    </section>
+</article>
diff --git a/src/TestWebsites/NET4/Web.config b/src/TestWebsites/NET4/Web.config
index 7dead1a07..134e1a427 100644
--- a/src/TestWebsites/NET4/Web.config
+++ b/src/TestWebsites/NET4/Web.config
@@ -60,11 +60,11 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.6.3.0" newVersion="2.6.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.5.19.0" newVersion="2.5.19.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.6.3.0" newVersion="2.6.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.5.19.0" newVersion="2.5.19.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/src/TestWebsites/NET4/cache/cache.db b/src/TestWebsites/NET4/cache/cache.db
index 2ba988692..c1e11601e 100644
Binary files a/src/TestWebsites/NET4/cache/cache.db and b/src/TestWebsites/NET4/cache/cache.db differ
diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Images/Thumbs.db.REMOVED.git-id b/src/TestWebsites/NET45/Test_Website_NET45/Images/Thumbs.db.REMOVED.git-id
deleted file mode 100644
index 367d139ca..000000000
--- a/src/TestWebsites/NET45/Test_Website_NET45/Images/Thumbs.db.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-4815095bb7f32beb6d9e9564a77c83a64120b5c6
\ No newline at end of file
diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Test_Website_NET45.csproj b/src/TestWebsites/NET45/Test_Website_NET45/Test_Website_NET45.csproj
index 499234b9f..df1a8e5f8 100644
--- a/src/TestWebsites/NET45/Test_Website_NET45/Test_Website_NET45.csproj
+++ b/src/TestWebsites/NET45/Test_Website_NET45/Test_Website_NET45.csproj
@@ -141,6 +141,7 @@
     <Content Include="Images\Penguins.gif" />
     <Content Include="Images\Penguins.jpg" />
     <Content Include="Images\Penguins.png" />
+    <Content Include="Images\Penguins.tif" />
     <Content Include="Images\Tulips.jpg" />
     <Content Include="Images\udendørs.jpg" />
     <Content Include="Images\war_horse_quad.jpg" />
diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Index.cshtml b/src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Index.cshtml
index 2efa21511..d80616784 100644
--- a/src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Index.cshtml
+++ b/src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Index.cshtml
@@ -70,7 +70,7 @@
         <div class="row">
             <div class="column-6">
                 <h2>Watermark</h2>
-                <img src="/images/Penguins.jpg?width=300&watermark=text-test|color-fff|size-48|style-italic|opacity-100|position-100-100|shadow-true|font-arial" />
+                <img src="/images/Penguins.jpg?width=300&watermark=text-This+is+a+long+body+of+copy+that+should+wrap|color-fff|size-24|style-italic|opacity-100|position-100-100|shadow-true|font-arial" />
             </div>
             <div class="column-6">
                 <h2>Format</h2>
diff --git a/src/packages/Microsoft.Bcl.1.1.3/License-RTM.rtf.REMOVED.git-id b/src/packages/Microsoft.Bcl.1.0.19/License.rtf.REMOVED.git-id
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/License-RTM.rtf.REMOVED.git-id
rename to src/packages/Microsoft.Bcl.1.0.19/License.rtf.REMOVED.git-id
diff --git a/src/packages/Microsoft.Bcl.1.0.19/Microsoft.Bcl.1.0.19.nupkg.REMOVED.git-id b/src/packages/Microsoft.Bcl.1.0.19/Microsoft.Bcl.1.0.19.nupkg.REMOVED.git-id
new file mode 100644
index 000000000..16a7e0ac2
--- /dev/null
+++ b/src/packages/Microsoft.Bcl.1.0.19/Microsoft.Bcl.1.0.19.nupkg.REMOVED.git-id
@@ -0,0 +1 @@
+8383f696d05c6a3f3061683355d21bd2a303c8a4
\ No newline at end of file
diff --git a/src/packages/Microsoft.Bcl.1.0.19/Microsoft.Bcl.1.0.19.nuspec b/src/packages/Microsoft.Bcl.1.0.19/Microsoft.Bcl.1.0.19.nuspec
new file mode 100644
index 000000000..75dc330e5
--- /dev/null
+++ b/src/packages/Microsoft.Bcl.1.0.19/Microsoft.Bcl.1.0.19.nuspec
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    <id>Microsoft.Bcl</id>
+    <version>1.0.19</version>
+    <title>BCL Portability Pack for .NET Framework 4, Silverlight 4 and 5, and Windows Phone 7.5</title>
+    <authors>Microsoft</authors>
+    <owners>Microsoft</owners>
+    <licenseUrl>http://go.microsoft.com/fwlink/?LinkID=296435</licenseUrl>
+    <projectUrl>http://go.microsoft.com/fwlink/?LinkID=280057</projectUrl>
+    <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <description>This packages enables projects targeting .NET Framework 4, Silverlight 4 and 5, and Windows Phone 7.5 (including any portable library combinations) to use new types from later versions of .NET including:
+
+CallerMemberNameAttribute
+CallerLineNumberAttribute
+CallerFilePathAttribute
+Tuple&lt;T1, T2, ...&gt;
+IProgress&lt;T&gt;
+IStructuralComparable
+IStructuralEquatable
+Task
+
+These types are "unified" to their later version equivalent. For example, when running on .NET Framework 4.5, IProgress&lt;T&gt; from this package will be seen by the runtime as the same type as the one already in the platform.
+
+This package is not required for projects targeting .NET Framework 4.5 or .NET for Windows Store apps. For known issues, please see: http://blogs.msdn.com/b/bclteam/p/asynctargetingpackkb.aspx.</description>
+    <summary>Adds support for types from later versions to .NET Framework 4, Silverlight 4 and 5, and Windows Phone 7.5.</summary>
+    <copyright>Copyright © Microsoft Corporation</copyright>
+    <tags>BCL Microsoft System Task IProgress</tags>
+    <dependencies>
+      <dependency id="Microsoft.Bcl.Build" version="1.0.4" />
+    </dependencies>
+  </metadata>
+</package>
\ No newline at end of file
diff --git a/src/packages/Microsoft.Bcl.1.1.3/ReleaseNotes.txt b/src/packages/Microsoft.Bcl.1.0.19/ReleaseNotes.txt
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/ReleaseNotes.txt
rename to src/packages/Microsoft.Bcl.1.0.19/ReleaseNotes.txt
diff --git a/src/packages/Microsoft.Bcl.1.1.3/content/net45/_._ b/src/packages/Microsoft.Bcl.1.0.19/content/net45/_._
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/content/net45/_._
rename to src/packages/Microsoft.Bcl.1.0.19/content/net45/_._
diff --git a/src/packages/Microsoft.Bcl.1.1.3/content/portable-net45+win8+wp8/_._ b/src/packages/Microsoft.Bcl.1.0.19/content/portable-net45+win8+wp8/_._
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/content/portable-net45+win8+wp8/_._
rename to src/packages/Microsoft.Bcl.1.0.19/content/portable-net45+win8+wp8/_._
diff --git a/src/packages/Microsoft.Bcl.1.1.3/content/sl4/_._ b/src/packages/Microsoft.Bcl.1.0.19/content/sl4/_._
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/content/sl4/_._
rename to src/packages/Microsoft.Bcl.1.0.19/content/sl4/_._
diff --git a/src/packages/Microsoft.Bcl.1.1.3/content/sl5/_._ b/src/packages/Microsoft.Bcl.1.0.19/content/sl5/_._
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/content/sl5/_._
rename to src/packages/Microsoft.Bcl.1.0.19/content/sl5/_._
diff --git a/src/packages/Microsoft.Bcl.1.1.3/content/win8/_._ b/src/packages/Microsoft.Bcl.1.0.19/content/win8/_._
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/content/win8/_._
rename to src/packages/Microsoft.Bcl.1.0.19/content/win8/_._
diff --git a/src/packages/Microsoft.Bcl.1.1.3/content/wp8/_._ b/src/packages/Microsoft.Bcl.1.0.19/content/wp8/_._
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/content/wp8/_._
rename to src/packages/Microsoft.Bcl.1.0.19/content/wp8/_._
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp8/System.Runtime.dll b/src/packages/Microsoft.Bcl.1.0.19/lib/net40/System.Runtime.dll
similarity index 59%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp8/System.Runtime.dll
rename to src/packages/Microsoft.Bcl.1.0.19/lib/net40/System.Runtime.dll
index 4568c09de..fa831ade4 100644
Binary files a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp8/System.Runtime.dll and b/src/packages/Microsoft.Bcl.1.0.19/lib/net40/System.Runtime.dll differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/net40/System.Runtime.xml b/src/packages/Microsoft.Bcl.1.0.19/lib/net40/System.Runtime.xml
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/net40/System.Runtime.xml
rename to src/packages/Microsoft.Bcl.1.0.19/lib/net40/System.Runtime.xml
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl5+win8+wp8/System.Threading.Tasks.dll b/src/packages/Microsoft.Bcl.1.0.19/lib/net40/System.Threading.Tasks.dll
similarity index 62%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl5+win8+wp8/System.Threading.Tasks.dll
rename to src/packages/Microsoft.Bcl.1.0.19/lib/net40/System.Threading.Tasks.dll
index 3127650be..ebbac4cd1 100644
Binary files a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl5+win8+wp8/System.Threading.Tasks.dll and b/src/packages/Microsoft.Bcl.1.0.19/lib/net40/System.Threading.Tasks.dll differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/net40/System.Threading.Tasks.xml b/src/packages/Microsoft.Bcl.1.0.19/lib/net40/System.Threading.Tasks.xml
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/net40/System.Threading.Tasks.xml
rename to src/packages/Microsoft.Bcl.1.0.19/lib/net40/System.Threading.Tasks.xml
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/net40/ensureRedirect.xml b/src/packages/Microsoft.Bcl.1.0.19/lib/net40/ensureRedirect.xml
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/net40/ensureRedirect.xml
rename to src/packages/Microsoft.Bcl.1.0.19/lib/net40/ensureRedirect.xml
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/net45/_._ b/src/packages/Microsoft.Bcl.1.0.19/lib/net45/_._
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/net45/_._
rename to src/packages/Microsoft.Bcl.1.0.19/lib/net45/_._
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp71/System.Runtime.dll b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp71/System.Runtime.dll
similarity index 61%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp71/System.Runtime.dll
rename to src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp71/System.Runtime.dll
index f6be3de10..97ab730f2 100644
Binary files a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp71/System.Runtime.dll and b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp71/System.Runtime.dll differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp71/System.Runtime.xml b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp71/System.Runtime.xml
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp71/System.Runtime.xml
rename to src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp71/System.Runtime.xml
diff --git a/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp71/System.Threading.Tasks.dll.REMOVED.git-id b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp71/System.Threading.Tasks.dll.REMOVED.git-id
new file mode 100644
index 000000000..3b60eb99b
--- /dev/null
+++ b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp71/System.Threading.Tasks.dll.REMOVED.git-id
@@ -0,0 +1 @@
+74f5e2caed93499de991cfd5ed70b868e5207474
\ No newline at end of file
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp71/System.Threading.Tasks.xml.REMOVED.git-id b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp71/System.Threading.Tasks.xml.REMOVED.git-id
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp71/System.Threading.Tasks.xml.REMOVED.git-id
rename to src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp71/System.Threading.Tasks.xml.REMOVED.git-id
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp71/ensureRedirect.xml b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp71/ensureRedirect.xml
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp71/ensureRedirect.xml
rename to src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp71/ensureRedirect.xml
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/net40/System.Runtime.dll b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp8/System.Runtime.dll
similarity index 59%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/net40/System.Runtime.dll
rename to src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp8/System.Runtime.dll
index 4568c09de..fa831ade4 100644
Binary files a/src/packages/Microsoft.Bcl.1.1.3/lib/net40/System.Runtime.dll and b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp8/System.Runtime.dll differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp8/System.Runtime.xml b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp8/System.Runtime.xml
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp8/System.Runtime.xml
rename to src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp8/System.Runtime.xml
diff --git a/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp8/System.Threading.Tasks.dll.REMOVED.git-id b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp8/System.Threading.Tasks.dll.REMOVED.git-id
new file mode 100644
index 000000000..3b60eb99b
--- /dev/null
+++ b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp8/System.Threading.Tasks.dll.REMOVED.git-id
@@ -0,0 +1 @@
+74f5e2caed93499de991cfd5ed70b868e5207474
\ No newline at end of file
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp8/System.Threading.Tasks.xml.REMOVED.git-id b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp8/System.Threading.Tasks.xml.REMOVED.git-id
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp8/System.Threading.Tasks.xml.REMOVED.git-id
rename to src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp8/System.Threading.Tasks.xml.REMOVED.git-id
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp8/ensureRedirect.xml b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp8/ensureRedirect.xml
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp8/ensureRedirect.xml
rename to src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8+wp8/ensureRedirect.xml
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8/System.Runtime.dll b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8/System.Runtime.dll
similarity index 59%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8/System.Runtime.dll
rename to src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8/System.Runtime.dll
index 4568c09de..fa831ade4 100644
Binary files a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8/System.Runtime.dll and b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8/System.Runtime.dll differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8/System.Runtime.xml b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8/System.Runtime.xml
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8/System.Runtime.xml
rename to src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8/System.Runtime.xml
diff --git a/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8/System.Threading.Tasks.dll.REMOVED.git-id b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8/System.Threading.Tasks.dll.REMOVED.git-id
new file mode 100644
index 000000000..3b60eb99b
--- /dev/null
+++ b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8/System.Threading.Tasks.dll.REMOVED.git-id
@@ -0,0 +1 @@
+74f5e2caed93499de991cfd5ed70b868e5207474
\ No newline at end of file
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8/System.Threading.Tasks.xml.REMOVED.git-id b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8/System.Threading.Tasks.xml.REMOVED.git-id
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8/System.Threading.Tasks.xml.REMOVED.git-id
rename to src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8/System.Threading.Tasks.xml.REMOVED.git-id
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8/ensureRedirect.xml b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8/ensureRedirect.xml
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8/ensureRedirect.xml
rename to src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl4+win8/ensureRedirect.xml
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl5+win8+wp8/System.Runtime.dll b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl5+win8+wp8/System.Runtime.dll
similarity index 59%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl5+win8+wp8/System.Runtime.dll
rename to src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl5+win8+wp8/System.Runtime.dll
index 4568c09de..fa831ade4 100644
Binary files a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl5+win8+wp8/System.Runtime.dll and b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl5+win8+wp8/System.Runtime.dll differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl5+win8+wp8/System.Runtime.xml b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl5+win8+wp8/System.Runtime.xml
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl5+win8+wp8/System.Runtime.xml
rename to src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl5+win8+wp8/System.Runtime.xml
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8+wp8/System.Threading.Tasks.dll b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl5+win8+wp8/System.Threading.Tasks.dll
similarity index 62%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8+wp8/System.Threading.Tasks.dll
rename to src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl5+win8+wp8/System.Threading.Tasks.dll
index 3127650be..ebbac4cd1 100644
Binary files a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8+wp8/System.Threading.Tasks.dll and b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl5+win8+wp8/System.Threading.Tasks.dll differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl5+win8+wp8/System.Threading.Tasks.xml b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl5+win8+wp8/System.Threading.Tasks.xml
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl5+win8+wp8/System.Threading.Tasks.xml
rename to src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl5+win8+wp8/System.Threading.Tasks.xml
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl5+win8+wp8/ensureRedirect.xml b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl5+win8+wp8/ensureRedirect.xml
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl5+win8+wp8/ensureRedirect.xml
rename to src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+sl5+win8+wp8/ensureRedirect.xml
diff --git a/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8+wp8/System.Runtime.dll b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8+wp8/System.Runtime.dll
new file mode 100644
index 000000000..fa831ade4
Binary files /dev/null and b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8+wp8/System.Runtime.dll differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8+wp8/System.Runtime.xml b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8+wp8/System.Runtime.xml
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8+wp8/System.Runtime.xml
rename to src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8+wp8/System.Runtime.xml
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/net40/System.Threading.Tasks.dll b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8+wp8/System.Threading.Tasks.dll
similarity index 62%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/net40/System.Threading.Tasks.dll
rename to src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8+wp8/System.Threading.Tasks.dll
index 3127650be..ebbac4cd1 100644
Binary files a/src/packages/Microsoft.Bcl.1.1.3/lib/net40/System.Threading.Tasks.dll and b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8+wp8/System.Threading.Tasks.dll differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8+wp8/System.Threading.Tasks.xml b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8+wp8/System.Threading.Tasks.xml
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8+wp8/System.Threading.Tasks.xml
rename to src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8+wp8/System.Threading.Tasks.xml
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8+wp8/ensureRedirect.xml b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8+wp8/ensureRedirect.xml
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8+wp8/ensureRedirect.xml
rename to src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8+wp8/ensureRedirect.xml
diff --git a/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8/System.Runtime.dll b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8/System.Runtime.dll
new file mode 100644
index 000000000..fa831ade4
Binary files /dev/null and b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8/System.Runtime.dll differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8/System.Runtime.xml b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8/System.Runtime.xml
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8/System.Runtime.xml
rename to src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8/System.Runtime.xml
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8/System.Threading.Tasks.dll b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8/System.Threading.Tasks.dll
similarity index 62%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8/System.Threading.Tasks.dll
rename to src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8/System.Threading.Tasks.dll
index 3127650be..ebbac4cd1 100644
Binary files a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8/System.Threading.Tasks.dll and b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8/System.Threading.Tasks.dll differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8/System.Threading.Tasks.xml b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8/System.Threading.Tasks.xml
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8/System.Threading.Tasks.xml
rename to src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8/System.Threading.Tasks.xml
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8/ensureRedirect.xml b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8/ensureRedirect.xml
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8/ensureRedirect.xml
rename to src/packages/Microsoft.Bcl.1.0.19/lib/portable-net40+win8/ensureRedirect.xml
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net45+win8+wp8/_._ b/src/packages/Microsoft.Bcl.1.0.19/lib/portable-net45+win8+wp8/_._
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/portable-net45+win8+wp8/_._
rename to src/packages/Microsoft.Bcl.1.0.19/lib/portable-net45+win8+wp8/_._
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/sl4-windowsphone71/System.Runtime.dll b/src/packages/Microsoft.Bcl.1.0.19/lib/sl4-windowsphone71/System.Runtime.dll
similarity index 61%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/sl4-windowsphone71/System.Runtime.dll
rename to src/packages/Microsoft.Bcl.1.0.19/lib/sl4-windowsphone71/System.Runtime.dll
index f6be3de10..97ab730f2 100644
Binary files a/src/packages/Microsoft.Bcl.1.1.3/lib/sl4-windowsphone71/System.Runtime.dll and b/src/packages/Microsoft.Bcl.1.0.19/lib/sl4-windowsphone71/System.Runtime.dll differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/sl4-windowsphone71/System.Runtime.xml b/src/packages/Microsoft.Bcl.1.0.19/lib/sl4-windowsphone71/System.Runtime.xml
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/sl4-windowsphone71/System.Runtime.xml
rename to src/packages/Microsoft.Bcl.1.0.19/lib/sl4-windowsphone71/System.Runtime.xml
diff --git a/src/packages/Microsoft.Bcl.1.0.19/lib/sl4-windowsphone71/System.Threading.Tasks.dll.REMOVED.git-id b/src/packages/Microsoft.Bcl.1.0.19/lib/sl4-windowsphone71/System.Threading.Tasks.dll.REMOVED.git-id
new file mode 100644
index 000000000..3b60eb99b
--- /dev/null
+++ b/src/packages/Microsoft.Bcl.1.0.19/lib/sl4-windowsphone71/System.Threading.Tasks.dll.REMOVED.git-id
@@ -0,0 +1 @@
+74f5e2caed93499de991cfd5ed70b868e5207474
\ No newline at end of file
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/sl4-windowsphone71/System.Threading.Tasks.xml.REMOVED.git-id b/src/packages/Microsoft.Bcl.1.0.19/lib/sl4-windowsphone71/System.Threading.Tasks.xml.REMOVED.git-id
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/sl4-windowsphone71/System.Threading.Tasks.xml.REMOVED.git-id
rename to src/packages/Microsoft.Bcl.1.0.19/lib/sl4-windowsphone71/System.Threading.Tasks.xml.REMOVED.git-id
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/sl4-windowsphone71/ensureRedirect.xml b/src/packages/Microsoft.Bcl.1.0.19/lib/sl4-windowsphone71/ensureRedirect.xml
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/sl4-windowsphone71/ensureRedirect.xml
rename to src/packages/Microsoft.Bcl.1.0.19/lib/sl4-windowsphone71/ensureRedirect.xml
diff --git a/src/packages/Microsoft.Bcl.1.0.19/lib/sl4/System.Runtime.dll b/src/packages/Microsoft.Bcl.1.0.19/lib/sl4/System.Runtime.dll
new file mode 100644
index 000000000..fa831ade4
Binary files /dev/null and b/src/packages/Microsoft.Bcl.1.0.19/lib/sl4/System.Runtime.dll differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/sl4/System.Runtime.xml b/src/packages/Microsoft.Bcl.1.0.19/lib/sl4/System.Runtime.xml
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/sl4/System.Runtime.xml
rename to src/packages/Microsoft.Bcl.1.0.19/lib/sl4/System.Runtime.xml
diff --git a/src/packages/Microsoft.Bcl.1.0.19/lib/sl4/System.Threading.Tasks.dll.REMOVED.git-id b/src/packages/Microsoft.Bcl.1.0.19/lib/sl4/System.Threading.Tasks.dll.REMOVED.git-id
new file mode 100644
index 000000000..3b60eb99b
--- /dev/null
+++ b/src/packages/Microsoft.Bcl.1.0.19/lib/sl4/System.Threading.Tasks.dll.REMOVED.git-id
@@ -0,0 +1 @@
+74f5e2caed93499de991cfd5ed70b868e5207474
\ No newline at end of file
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/sl4/System.Threading.Tasks.xml.REMOVED.git-id b/src/packages/Microsoft.Bcl.1.0.19/lib/sl4/System.Threading.Tasks.xml.REMOVED.git-id
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/sl4/System.Threading.Tasks.xml.REMOVED.git-id
rename to src/packages/Microsoft.Bcl.1.0.19/lib/sl4/System.Threading.Tasks.xml.REMOVED.git-id
diff --git a/src/packages/Microsoft.Bcl.1.0.19/lib/sl5/System.Runtime.dll b/src/packages/Microsoft.Bcl.1.0.19/lib/sl5/System.Runtime.dll
new file mode 100644
index 000000000..fa831ade4
Binary files /dev/null and b/src/packages/Microsoft.Bcl.1.0.19/lib/sl5/System.Runtime.dll differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/sl5/System.Runtime.xml b/src/packages/Microsoft.Bcl.1.0.19/lib/sl5/System.Runtime.xml
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/sl5/System.Runtime.xml
rename to src/packages/Microsoft.Bcl.1.0.19/lib/sl5/System.Runtime.xml
diff --git a/src/packages/Microsoft.Bcl.1.0.19/lib/sl5/System.Threading.Tasks.dll b/src/packages/Microsoft.Bcl.1.0.19/lib/sl5/System.Threading.Tasks.dll
new file mode 100644
index 000000000..ebbac4cd1
Binary files /dev/null and b/src/packages/Microsoft.Bcl.1.0.19/lib/sl5/System.Threading.Tasks.dll differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/sl5/System.Threading.Tasks.xml b/src/packages/Microsoft.Bcl.1.0.19/lib/sl5/System.Threading.Tasks.xml
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/sl5/System.Threading.Tasks.xml
rename to src/packages/Microsoft.Bcl.1.0.19/lib/sl5/System.Threading.Tasks.xml
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/win8/_._ b/src/packages/Microsoft.Bcl.1.0.19/lib/win8/_._
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/win8/_._
rename to src/packages/Microsoft.Bcl.1.0.19/lib/win8/_._
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/wp8/_._ b/src/packages/Microsoft.Bcl.1.0.19/lib/wp8/_._
similarity index 100%
rename from src/packages/Microsoft.Bcl.1.1.3/lib/wp8/_._
rename to src/packages/Microsoft.Bcl.1.0.19/lib/wp8/_._
diff --git a/src/packages/Microsoft.Bcl.1.1.3/Microsoft.Bcl.1.1.3.nupkg.REMOVED.git-id b/src/packages/Microsoft.Bcl.1.1.3/Microsoft.Bcl.1.1.3.nupkg.REMOVED.git-id
deleted file mode 100644
index 1bea84908..000000000
--- a/src/packages/Microsoft.Bcl.1.1.3/Microsoft.Bcl.1.1.3.nupkg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-3a1dff62fc252afd94aab2c0a4e74c652e6e1863
\ No newline at end of file
diff --git a/src/packages/Microsoft.Bcl.1.1.3/Microsoft.Bcl.1.1.3.nuspec b/src/packages/Microsoft.Bcl.1.1.3/Microsoft.Bcl.1.1.3.nuspec
deleted file mode 100644
index f8d292531..000000000
--- a/src/packages/Microsoft.Bcl.1.1.3/Microsoft.Bcl.1.1.3.nuspec
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
-  <metadata>
-    <id>Microsoft.Bcl</id>
-    <version>1.1.3</version>
-    <title>Microsoft BCL Portability Pack</title>
-    <authors>Microsoft</authors>
-    <owners>Microsoft</owners>
-    <licenseUrl>http://go.microsoft.com/fwlink/?LinkID=296435</licenseUrl>
-    <projectUrl>http://go.microsoft.com/fwlink/?LinkID=280057</projectUrl>
-    <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>This packages enables projects targeting down-level platforms to use some of the types added in later versions including:
-
-- CallerMemberNameAttribute
-- CallerLineNumberAttribute
-- CallerFilePathAttribute
-- Tuple&lt;T1, T2, ...&gt;
-- IProgress&lt;T&gt;
-- IStructuralComparable
-- IStructuralEquatable
-- Task
-- InvalidDataException
-
-These types are "unified" to their later version equivalent. For example, when running on .NET Framework 4.5, IProgress&lt;T&gt; from this package will be seen by the runtime as the same type as the one already available in the platform.
-
-Supported Platforms:
-- .NET Framework 4 (with KB2468871)
-- Windows Phone 7.5
-- Silverlight 4 and 5
-- Portable Class Libraries
-This package is only required for projects targeting .NET Framework 4.5, NET for Windows Store apps or Windows Phone 8 when consuming a library that uses this package.</description>
-    <summary>Adds support for types added in later versions of .NET when targeting previous versions.</summary>
-    <copyright>Copyright © Microsoft Corporation</copyright>
-    <tags>BCL Microsoft System Task IProgress</tags>
-    <dependencies>
-      <dependency id="Microsoft.Bcl.Build" version="1.0.4" />
-    </dependencies>
-  </metadata>
-</package>
\ No newline at end of file
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/net40/System.IO.dll b/src/packages/Microsoft.Bcl.1.1.3/lib/net40/System.IO.dll
deleted file mode 100644
index c6565fb99..000000000
Binary files a/src/packages/Microsoft.Bcl.1.1.3/lib/net40/System.IO.dll and /dev/null differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/net40/System.IO.xml b/src/packages/Microsoft.Bcl.1.1.3/lib/net40/System.IO.xml
deleted file mode 100644
index 865aa1a4f..000000000
--- a/src/packages/Microsoft.Bcl.1.1.3/lib/net40/System.IO.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>System.IO</name>
-    </assembly>
-    <members>
-    </members>
-</doc>
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp71/System.IO.dll b/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp71/System.IO.dll
deleted file mode 100644
index fe0652d18..000000000
Binary files a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp71/System.IO.dll and /dev/null differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp71/System.IO.xml b/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp71/System.IO.xml
deleted file mode 100644
index e83273427..000000000
--- a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp71/System.IO.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>System.IO</name>
-    </assembly>
-    <members>
-        <member name="T:System.Strings">
-            <summary>
-              A strongly-typed resource class, for looking up localized strings, etc.
-            </summary>
-        </member>
-        <member name="P:System.Strings.ResourceManager">
-            <summary>
-              Returns the cached ResourceManager instance used by this class.
-            </summary>
-        </member>
-        <member name="P:System.Strings.Culture">
-            <summary>
-              Overrides the current thread's CurrentUICulture property for all
-              resource lookups using this strongly typed resource class.
-            </summary>
-        </member>
-        <member name="P:System.Strings.GenericInvalidData">
-            <summary>
-              Looks up a localized string similar to Found invalid data while decoding..
-            </summary>
-        </member>
-        <member name="T:System.IO.InvalidDataException">
-            <summary>
-            The exception that is thrown when a data stream is in an invalid format.
-            </summary>
-        </member>
-        <member name="M:System.IO.InvalidDataException.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:System.IO.InvalidDataException" /> class.
-            </summary>
-        </member>
-        <member name="M:System.IO.InvalidDataException.#ctor(System.String)">
-            <summary>
-            Initializes a new instance of the <see cref="T:System.IO.InvalidDataException" /> class with a specified error message.
-            </summary>
-            <param name="message">The error message that explains the reason for the exception.</param>
-        </member>
-        <member name="M:System.IO.InvalidDataException.#ctor(System.String,System.Exception)">
-            <summary>
-            Initializes a new instance of the <see cref="T:System.IO.InvalidDataException" /> class with a reference to the inner exception that is the cause of this exception.</summary>
-            <param name="message">The error message that explains the reason for the exception.</param>
-            <param name="innerException">The exception that is the cause of the current exception. If the <paramref name="innerException" /> parameter is not null, the current exception is raised in a catch block that handles the inner exception.</param>
-        </member>
-    </members>
-</doc>
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp71/System.Threading.Tasks.dll.REMOVED.git-id b/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp71/System.Threading.Tasks.dll.REMOVED.git-id
deleted file mode 100644
index 8deae8745..000000000
--- a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp71/System.Threading.Tasks.dll.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-8505ccfda26708157b54875a630260e911b31a79
\ No newline at end of file
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp8/System.IO.dll b/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp8/System.IO.dll
deleted file mode 100644
index fe0652d18..000000000
Binary files a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp8/System.IO.dll and /dev/null differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp8/System.IO.xml b/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp8/System.IO.xml
deleted file mode 100644
index e83273427..000000000
--- a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp8/System.IO.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>System.IO</name>
-    </assembly>
-    <members>
-        <member name="T:System.Strings">
-            <summary>
-              A strongly-typed resource class, for looking up localized strings, etc.
-            </summary>
-        </member>
-        <member name="P:System.Strings.ResourceManager">
-            <summary>
-              Returns the cached ResourceManager instance used by this class.
-            </summary>
-        </member>
-        <member name="P:System.Strings.Culture">
-            <summary>
-              Overrides the current thread's CurrentUICulture property for all
-              resource lookups using this strongly typed resource class.
-            </summary>
-        </member>
-        <member name="P:System.Strings.GenericInvalidData">
-            <summary>
-              Looks up a localized string similar to Found invalid data while decoding..
-            </summary>
-        </member>
-        <member name="T:System.IO.InvalidDataException">
-            <summary>
-            The exception that is thrown when a data stream is in an invalid format.
-            </summary>
-        </member>
-        <member name="M:System.IO.InvalidDataException.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:System.IO.InvalidDataException" /> class.
-            </summary>
-        </member>
-        <member name="M:System.IO.InvalidDataException.#ctor(System.String)">
-            <summary>
-            Initializes a new instance of the <see cref="T:System.IO.InvalidDataException" /> class with a specified error message.
-            </summary>
-            <param name="message">The error message that explains the reason for the exception.</param>
-        </member>
-        <member name="M:System.IO.InvalidDataException.#ctor(System.String,System.Exception)">
-            <summary>
-            Initializes a new instance of the <see cref="T:System.IO.InvalidDataException" /> class with a reference to the inner exception that is the cause of this exception.</summary>
-            <param name="message">The error message that explains the reason for the exception.</param>
-            <param name="innerException">The exception that is the cause of the current exception. If the <paramref name="innerException" /> parameter is not null, the current exception is raised in a catch block that handles the inner exception.</param>
-        </member>
-    </members>
-</doc>
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp8/System.Threading.Tasks.dll.REMOVED.git-id b/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp8/System.Threading.Tasks.dll.REMOVED.git-id
deleted file mode 100644
index 8deae8745..000000000
--- a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8+wp8/System.Threading.Tasks.dll.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-8505ccfda26708157b54875a630260e911b31a79
\ No newline at end of file
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8/System.IO.dll b/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8/System.IO.dll
deleted file mode 100644
index fe0652d18..000000000
Binary files a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8/System.IO.dll and /dev/null differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8/System.IO.xml b/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8/System.IO.xml
deleted file mode 100644
index e83273427..000000000
--- a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8/System.IO.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>System.IO</name>
-    </assembly>
-    <members>
-        <member name="T:System.Strings">
-            <summary>
-              A strongly-typed resource class, for looking up localized strings, etc.
-            </summary>
-        </member>
-        <member name="P:System.Strings.ResourceManager">
-            <summary>
-              Returns the cached ResourceManager instance used by this class.
-            </summary>
-        </member>
-        <member name="P:System.Strings.Culture">
-            <summary>
-              Overrides the current thread's CurrentUICulture property for all
-              resource lookups using this strongly typed resource class.
-            </summary>
-        </member>
-        <member name="P:System.Strings.GenericInvalidData">
-            <summary>
-              Looks up a localized string similar to Found invalid data while decoding..
-            </summary>
-        </member>
-        <member name="T:System.IO.InvalidDataException">
-            <summary>
-            The exception that is thrown when a data stream is in an invalid format.
-            </summary>
-        </member>
-        <member name="M:System.IO.InvalidDataException.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:System.IO.InvalidDataException" /> class.
-            </summary>
-        </member>
-        <member name="M:System.IO.InvalidDataException.#ctor(System.String)">
-            <summary>
-            Initializes a new instance of the <see cref="T:System.IO.InvalidDataException" /> class with a specified error message.
-            </summary>
-            <param name="message">The error message that explains the reason for the exception.</param>
-        </member>
-        <member name="M:System.IO.InvalidDataException.#ctor(System.String,System.Exception)">
-            <summary>
-            Initializes a new instance of the <see cref="T:System.IO.InvalidDataException" /> class with a reference to the inner exception that is the cause of this exception.</summary>
-            <param name="message">The error message that explains the reason for the exception.</param>
-            <param name="innerException">The exception that is the cause of the current exception. If the <paramref name="innerException" /> parameter is not null, the current exception is raised in a catch block that handles the inner exception.</param>
-        </member>
-    </members>
-</doc>
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8/System.Threading.Tasks.dll.REMOVED.git-id b/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8/System.Threading.Tasks.dll.REMOVED.git-id
deleted file mode 100644
index 8deae8745..000000000
--- a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl4+win8/System.Threading.Tasks.dll.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-8505ccfda26708157b54875a630260e911b31a79
\ No newline at end of file
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl5+win8+wp8/System.IO.dll b/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl5+win8+wp8/System.IO.dll
deleted file mode 100644
index fe0652d18..000000000
Binary files a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl5+win8+wp8/System.IO.dll and /dev/null differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl5+win8+wp8/System.IO.xml b/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl5+win8+wp8/System.IO.xml
deleted file mode 100644
index e83273427..000000000
--- a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+sl5+win8+wp8/System.IO.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>System.IO</name>
-    </assembly>
-    <members>
-        <member name="T:System.Strings">
-            <summary>
-              A strongly-typed resource class, for looking up localized strings, etc.
-            </summary>
-        </member>
-        <member name="P:System.Strings.ResourceManager">
-            <summary>
-              Returns the cached ResourceManager instance used by this class.
-            </summary>
-        </member>
-        <member name="P:System.Strings.Culture">
-            <summary>
-              Overrides the current thread's CurrentUICulture property for all
-              resource lookups using this strongly typed resource class.
-            </summary>
-        </member>
-        <member name="P:System.Strings.GenericInvalidData">
-            <summary>
-              Looks up a localized string similar to Found invalid data while decoding..
-            </summary>
-        </member>
-        <member name="T:System.IO.InvalidDataException">
-            <summary>
-            The exception that is thrown when a data stream is in an invalid format.
-            </summary>
-        </member>
-        <member name="M:System.IO.InvalidDataException.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:System.IO.InvalidDataException" /> class.
-            </summary>
-        </member>
-        <member name="M:System.IO.InvalidDataException.#ctor(System.String)">
-            <summary>
-            Initializes a new instance of the <see cref="T:System.IO.InvalidDataException" /> class with a specified error message.
-            </summary>
-            <param name="message">The error message that explains the reason for the exception.</param>
-        </member>
-        <member name="M:System.IO.InvalidDataException.#ctor(System.String,System.Exception)">
-            <summary>
-            Initializes a new instance of the <see cref="T:System.IO.InvalidDataException" /> class with a reference to the inner exception that is the cause of this exception.</summary>
-            <param name="message">The error message that explains the reason for the exception.</param>
-            <param name="innerException">The exception that is the cause of the current exception. If the <paramref name="innerException" /> parameter is not null, the current exception is raised in a catch block that handles the inner exception.</param>
-        </member>
-    </members>
-</doc>
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8+wp8/System.IO.dll b/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8+wp8/System.IO.dll
deleted file mode 100644
index fe0652d18..000000000
Binary files a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8+wp8/System.IO.dll and /dev/null differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8+wp8/System.IO.xml b/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8+wp8/System.IO.xml
deleted file mode 100644
index e83273427..000000000
--- a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8+wp8/System.IO.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>System.IO</name>
-    </assembly>
-    <members>
-        <member name="T:System.Strings">
-            <summary>
-              A strongly-typed resource class, for looking up localized strings, etc.
-            </summary>
-        </member>
-        <member name="P:System.Strings.ResourceManager">
-            <summary>
-              Returns the cached ResourceManager instance used by this class.
-            </summary>
-        </member>
-        <member name="P:System.Strings.Culture">
-            <summary>
-              Overrides the current thread's CurrentUICulture property for all
-              resource lookups using this strongly typed resource class.
-            </summary>
-        </member>
-        <member name="P:System.Strings.GenericInvalidData">
-            <summary>
-              Looks up a localized string similar to Found invalid data while decoding..
-            </summary>
-        </member>
-        <member name="T:System.IO.InvalidDataException">
-            <summary>
-            The exception that is thrown when a data stream is in an invalid format.
-            </summary>
-        </member>
-        <member name="M:System.IO.InvalidDataException.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:System.IO.InvalidDataException" /> class.
-            </summary>
-        </member>
-        <member name="M:System.IO.InvalidDataException.#ctor(System.String)">
-            <summary>
-            Initializes a new instance of the <see cref="T:System.IO.InvalidDataException" /> class with a specified error message.
-            </summary>
-            <param name="message">The error message that explains the reason for the exception.</param>
-        </member>
-        <member name="M:System.IO.InvalidDataException.#ctor(System.String,System.Exception)">
-            <summary>
-            Initializes a new instance of the <see cref="T:System.IO.InvalidDataException" /> class with a reference to the inner exception that is the cause of this exception.</summary>
-            <param name="message">The error message that explains the reason for the exception.</param>
-            <param name="innerException">The exception that is the cause of the current exception. If the <paramref name="innerException" /> parameter is not null, the current exception is raised in a catch block that handles the inner exception.</param>
-        </member>
-    </members>
-</doc>
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8+wp8/System.Runtime.dll b/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8+wp8/System.Runtime.dll
deleted file mode 100644
index 4568c09de..000000000
Binary files a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8+wp8/System.Runtime.dll and /dev/null differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8/System.IO.dll b/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8/System.IO.dll
deleted file mode 100644
index c6565fb99..000000000
Binary files a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8/System.IO.dll and /dev/null differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8/System.IO.xml b/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8/System.IO.xml
deleted file mode 100644
index 865aa1a4f..000000000
--- a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8/System.IO.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>System.IO</name>
-    </assembly>
-    <members>
-    </members>
-</doc>
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8/System.Runtime.dll b/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8/System.Runtime.dll
deleted file mode 100644
index 4568c09de..000000000
Binary files a/src/packages/Microsoft.Bcl.1.1.3/lib/portable-net40+win8/System.Runtime.dll and /dev/null differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/sl4-windowsphone71/System.IO.dll b/src/packages/Microsoft.Bcl.1.1.3/lib/sl4-windowsphone71/System.IO.dll
deleted file mode 100644
index fe0652d18..000000000
Binary files a/src/packages/Microsoft.Bcl.1.1.3/lib/sl4-windowsphone71/System.IO.dll and /dev/null differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/sl4-windowsphone71/System.IO.xml b/src/packages/Microsoft.Bcl.1.1.3/lib/sl4-windowsphone71/System.IO.xml
deleted file mode 100644
index e83273427..000000000
--- a/src/packages/Microsoft.Bcl.1.1.3/lib/sl4-windowsphone71/System.IO.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>System.IO</name>
-    </assembly>
-    <members>
-        <member name="T:System.Strings">
-            <summary>
-              A strongly-typed resource class, for looking up localized strings, etc.
-            </summary>
-        </member>
-        <member name="P:System.Strings.ResourceManager">
-            <summary>
-              Returns the cached ResourceManager instance used by this class.
-            </summary>
-        </member>
-        <member name="P:System.Strings.Culture">
-            <summary>
-              Overrides the current thread's CurrentUICulture property for all
-              resource lookups using this strongly typed resource class.
-            </summary>
-        </member>
-        <member name="P:System.Strings.GenericInvalidData">
-            <summary>
-              Looks up a localized string similar to Found invalid data while decoding..
-            </summary>
-        </member>
-        <member name="T:System.IO.InvalidDataException">
-            <summary>
-            The exception that is thrown when a data stream is in an invalid format.
-            </summary>
-        </member>
-        <member name="M:System.IO.InvalidDataException.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:System.IO.InvalidDataException" /> class.
-            </summary>
-        </member>
-        <member name="M:System.IO.InvalidDataException.#ctor(System.String)">
-            <summary>
-            Initializes a new instance of the <see cref="T:System.IO.InvalidDataException" /> class with a specified error message.
-            </summary>
-            <param name="message">The error message that explains the reason for the exception.</param>
-        </member>
-        <member name="M:System.IO.InvalidDataException.#ctor(System.String,System.Exception)">
-            <summary>
-            Initializes a new instance of the <see cref="T:System.IO.InvalidDataException" /> class with a reference to the inner exception that is the cause of this exception.</summary>
-            <param name="message">The error message that explains the reason for the exception.</param>
-            <param name="innerException">The exception that is the cause of the current exception. If the <paramref name="innerException" /> parameter is not null, the current exception is raised in a catch block that handles the inner exception.</param>
-        </member>
-    </members>
-</doc>
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/sl4-windowsphone71/System.Threading.Tasks.dll.REMOVED.git-id b/src/packages/Microsoft.Bcl.1.1.3/lib/sl4-windowsphone71/System.Threading.Tasks.dll.REMOVED.git-id
deleted file mode 100644
index 8deae8745..000000000
--- a/src/packages/Microsoft.Bcl.1.1.3/lib/sl4-windowsphone71/System.Threading.Tasks.dll.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-8505ccfda26708157b54875a630260e911b31a79
\ No newline at end of file
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/sl4/System.IO.dll b/src/packages/Microsoft.Bcl.1.1.3/lib/sl4/System.IO.dll
deleted file mode 100644
index fe0652d18..000000000
Binary files a/src/packages/Microsoft.Bcl.1.1.3/lib/sl4/System.IO.dll and /dev/null differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/sl4/System.IO.xml b/src/packages/Microsoft.Bcl.1.1.3/lib/sl4/System.IO.xml
deleted file mode 100644
index e83273427..000000000
--- a/src/packages/Microsoft.Bcl.1.1.3/lib/sl4/System.IO.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>System.IO</name>
-    </assembly>
-    <members>
-        <member name="T:System.Strings">
-            <summary>
-              A strongly-typed resource class, for looking up localized strings, etc.
-            </summary>
-        </member>
-        <member name="P:System.Strings.ResourceManager">
-            <summary>
-              Returns the cached ResourceManager instance used by this class.
-            </summary>
-        </member>
-        <member name="P:System.Strings.Culture">
-            <summary>
-              Overrides the current thread's CurrentUICulture property for all
-              resource lookups using this strongly typed resource class.
-            </summary>
-        </member>
-        <member name="P:System.Strings.GenericInvalidData">
-            <summary>
-              Looks up a localized string similar to Found invalid data while decoding..
-            </summary>
-        </member>
-        <member name="T:System.IO.InvalidDataException">
-            <summary>
-            The exception that is thrown when a data stream is in an invalid format.
-            </summary>
-        </member>
-        <member name="M:System.IO.InvalidDataException.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:System.IO.InvalidDataException" /> class.
-            </summary>
-        </member>
-        <member name="M:System.IO.InvalidDataException.#ctor(System.String)">
-            <summary>
-            Initializes a new instance of the <see cref="T:System.IO.InvalidDataException" /> class with a specified error message.
-            </summary>
-            <param name="message">The error message that explains the reason for the exception.</param>
-        </member>
-        <member name="M:System.IO.InvalidDataException.#ctor(System.String,System.Exception)">
-            <summary>
-            Initializes a new instance of the <see cref="T:System.IO.InvalidDataException" /> class with a reference to the inner exception that is the cause of this exception.</summary>
-            <param name="message">The error message that explains the reason for the exception.</param>
-            <param name="innerException">The exception that is the cause of the current exception. If the <paramref name="innerException" /> parameter is not null, the current exception is raised in a catch block that handles the inner exception.</param>
-        </member>
-    </members>
-</doc>
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/sl4/System.Runtime.dll b/src/packages/Microsoft.Bcl.1.1.3/lib/sl4/System.Runtime.dll
deleted file mode 100644
index 4568c09de..000000000
Binary files a/src/packages/Microsoft.Bcl.1.1.3/lib/sl4/System.Runtime.dll and /dev/null differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/sl4/System.Threading.Tasks.dll.REMOVED.git-id b/src/packages/Microsoft.Bcl.1.1.3/lib/sl4/System.Threading.Tasks.dll.REMOVED.git-id
deleted file mode 100644
index 8deae8745..000000000
--- a/src/packages/Microsoft.Bcl.1.1.3/lib/sl4/System.Threading.Tasks.dll.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-8505ccfda26708157b54875a630260e911b31a79
\ No newline at end of file
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/sl5/System.IO.dll b/src/packages/Microsoft.Bcl.1.1.3/lib/sl5/System.IO.dll
deleted file mode 100644
index fe0652d18..000000000
Binary files a/src/packages/Microsoft.Bcl.1.1.3/lib/sl5/System.IO.dll and /dev/null differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/sl5/System.IO.xml b/src/packages/Microsoft.Bcl.1.1.3/lib/sl5/System.IO.xml
deleted file mode 100644
index e83273427..000000000
--- a/src/packages/Microsoft.Bcl.1.1.3/lib/sl5/System.IO.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>System.IO</name>
-    </assembly>
-    <members>
-        <member name="T:System.Strings">
-            <summary>
-              A strongly-typed resource class, for looking up localized strings, etc.
-            </summary>
-        </member>
-        <member name="P:System.Strings.ResourceManager">
-            <summary>
-              Returns the cached ResourceManager instance used by this class.
-            </summary>
-        </member>
-        <member name="P:System.Strings.Culture">
-            <summary>
-              Overrides the current thread's CurrentUICulture property for all
-              resource lookups using this strongly typed resource class.
-            </summary>
-        </member>
-        <member name="P:System.Strings.GenericInvalidData">
-            <summary>
-              Looks up a localized string similar to Found invalid data while decoding..
-            </summary>
-        </member>
-        <member name="T:System.IO.InvalidDataException">
-            <summary>
-            The exception that is thrown when a data stream is in an invalid format.
-            </summary>
-        </member>
-        <member name="M:System.IO.InvalidDataException.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:System.IO.InvalidDataException" /> class.
-            </summary>
-        </member>
-        <member name="M:System.IO.InvalidDataException.#ctor(System.String)">
-            <summary>
-            Initializes a new instance of the <see cref="T:System.IO.InvalidDataException" /> class with a specified error message.
-            </summary>
-            <param name="message">The error message that explains the reason for the exception.</param>
-        </member>
-        <member name="M:System.IO.InvalidDataException.#ctor(System.String,System.Exception)">
-            <summary>
-            Initializes a new instance of the <see cref="T:System.IO.InvalidDataException" /> class with a reference to the inner exception that is the cause of this exception.</summary>
-            <param name="message">The error message that explains the reason for the exception.</param>
-            <param name="innerException">The exception that is the cause of the current exception. If the <paramref name="innerException" /> parameter is not null, the current exception is raised in a catch block that handles the inner exception.</param>
-        </member>
-    </members>
-</doc>
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/sl5/System.Runtime.dll b/src/packages/Microsoft.Bcl.1.1.3/lib/sl5/System.Runtime.dll
deleted file mode 100644
index 4568c09de..000000000
Binary files a/src/packages/Microsoft.Bcl.1.1.3/lib/sl5/System.Runtime.dll and /dev/null differ
diff --git a/src/packages/Microsoft.Bcl.1.1.3/lib/sl5/System.Threading.Tasks.dll b/src/packages/Microsoft.Bcl.1.1.3/lib/sl5/System.Threading.Tasks.dll
deleted file mode 100644
index 3127650be..000000000
Binary files a/src/packages/Microsoft.Bcl.1.1.3/lib/sl5/System.Threading.Tasks.dll and /dev/null differ
diff --git a/src/packages/Microsoft.Bcl.Async.1.0.16/Microsoft.Bcl.Async.1.0.16.nuspec b/src/packages/Microsoft.Bcl.Async.1.0.16/Microsoft.Bcl.Async.1.0.16.nuspec
index 321d820f6..13d5f199e 100644
--- a/src/packages/Microsoft.Bcl.Async.1.0.16/Microsoft.Bcl.Async.1.0.16.nuspec
+++ b/src/packages/Microsoft.Bcl.Async.1.0.16/Microsoft.Bcl.Async.1.0.16.nuspec
@@ -14,7 +14,9 @@
 
 This package is not supported in Visual Studio 2010, and is only required for projects targeting .NET Framework 4.5 or .NET for Windows Store apps when consuming a library that uses this package. For known issues, please see: http://blogs.msdn.com/b/bclteam/p/asynctargetingpackkb.aspx.</description>
     <summary>Enables usage of the 'async' and 'await' keywords from projects targeting .NET Framework 4 (with KB2468871), Silverlight 4 and 5, and Windows Phone 7.5 and 8.</summary>
+    <releaseNotes />
     <copyright>Copyright © Microsoft Corporation</copyright>
+    <language />
     <tags>BCL Microsoft System Async Await Asynchronous</tags>
     <dependencies>
       <dependency id="Microsoft.Bcl" version="1.0.19" />