Merge remote-tracking branch 'origin/dev'

Conflicts:
	src/ImageProcessor.Web/NET45/Caching/MemCache.cs
	src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs

Former-commit-id: fd63b4005c2e542569504b6016104872939a14fa

src/ImageProcessor.Web/NET45/Caching/MemCache.cs

@@ -181,7 +181,12 @@ namespace ImageProcessor.Web.Caching
 
                 if (isRemoved)
                 {
+<<<<<<< HEAD
                     CacheItems.Keys.Remove(key);
+=======
+                    string removedValue;
+                    CacheItems.TryRemove(key, out removedValue);
+>>>>>>> origin/dev
                 }
             }
 
@@ -228,7 +233,12 @@ namespace ImageProcessor.Web.Caching
                     // Loop through and clear out the dictionary of cache keys.
                     foreach (KeyValuePair<string, string> cacheItem in tempDictionary)
                     {
+<<<<<<< HEAD
                         CacheItems.Keys.Remove(cacheItem.Key);
+=======
+                        string removedValue;
+                        CacheItems.TryRemove(cacheItem.Key, out removedValue);
+>>>>>>> origin/dev
                     }
                 }
             }
@@ -237,4 +247,8 @@ namespace ImageProcessor.Web.Caching
         }
         #endregion
     }
-}
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> origin/dev

src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs

@@ -31,5 +31,11 @@ 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:
+<<<<<<< HEAD
 [assembly: AssemblyVersion("3.0.0.0")]
 [assembly: AssemblyFileVersion("3.0.0.0")]
+=======
+[assembly: AssemblyVersion("3.0.0.1")]
+[assembly: AssemblyFileVersion("3.0.0.1")]
+
+>>>>>>> origin/dev