Index: /CKEditor.NET/trunk/CHANGES.html
===================================================================
--- /CKEditor.NET/trunk/CHANGES.html	(revision 6758)
+++ /CKEditor.NET/trunk/CHANGES.html	(revision 6759)
@@ -84,4 +84,5 @@
 		<li><a href="http://dev.ckeditor.com/ticket/7292">#7292</a> : Error: &quot;e is null&quot; when CKEditor is running inside the MultiView control.</li>
 		<li><a href="http://dev.ckeditor.com/ticket/7328">#7328</a> : Use <code>HttpUtility.HtmlDecode</code> to decode entities.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7695">#7695</a> : CKEditor was producing double slashes in URLs when BasePath contained a slash character at the end, which could lead to various issues.</li>
 	</ul>
 	<h2>
Index: /CKEditor.NET/trunk/CKEditor.NET/CKEditorControl.cs
===================================================================
--- /CKEditor.NET/trunk/CKEditor.NET/CKEditorControl.cs	(revision 6758)
+++ /CKEditor.NET/trunk/CKEditor.NET/CKEditorControl.cs	(revision 6759)
@@ -73,5 +73,10 @@
 				return (string)ViewState["BasePath"];
 			}
-			set { ViewState["BasePath"] = value; }
+			set
+			{
+				if (value.EndsWith("/"))
+					value = value.Remove(value.Length - 1);
+				ViewState["BasePath"] = value;
+			}
 		}