diff --git a/src/AddIns/Misc/SubversionAddIn/Project/ICSharpCode.Svn.addin b/src/AddIns/Misc/SubversionAddIn/Project/ICSharpCode.Svn.addin
index fed49ab1c2..ae2d88f888 100644
--- a/src/AddIns/Misc/SubversionAddIn/Project/ICSharpCode.Svn.addin
+++ b/src/AddIns/Misc/SubversionAddIn/Project/ICSharpCode.Svn.addin
@@ -125,6 +125,11 @@
 					          label = "${res:AddIns.Subversion.RemoveFromIgnoreList}"
 					          class = "ICSharpCode.Svn.Commands.UnignoreCommand"/>
 				</Condition>
+				<Condition name = "SubversionState" state = "Modified;Normal" item = "File">
+					<MenuItem id = "SvnLock"
+					          label = "${res:AddIns.Subversion.Lock}..."
+					          class = "ICSharpCode.Svn.Commands.LockCommand"/>
+				</Condition>
 				<Condition name = "SubversionState" state = "Modified;Normal" item = "File">
 					<MenuItem id = "SvnBlame"
 					          label = "${res:AddIns.Subversion.Blame}..."
diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/ProjectBrowserCommands.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/ProjectBrowserCommands.cs
index 846804e4b8..47154e5ba2 100644
--- a/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/ProjectBrowserCommands.cs
+++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/ProjectBrowserCommands.cs
@@ -229,6 +229,14 @@ namespace ICSharpCode.Svn.Commands
 		}
 	}
 	
+	public class LockCommand : SubversionCommand
+	{
+		protected override void Run(string filename)
+		{
+			SvnGuiWrapper.Lock(filename, null);
+		}
+	}
+	
 	public class BlameCommand : SubversionCommand
 	{
 		protected override void Run(string filename)
diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/SvnGuiWrapper.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/SvnGuiWrapper.cs
index 592ae8c10b..89bd6a00c3 100644
--- a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/SvnGuiWrapper.cs
+++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/SvnGuiWrapper.cs
@@ -204,6 +204,11 @@ namespace ICSharpCode.Svn
 			Proc("copy", fileName, callback);
 		}
 		
+		public static void Lock(string fileName, MethodInvoker callback)
+		{
+			Proc("lock", fileName, callback);
+		}
+		
 		public static void Blame(string fileName, MethodInvoker callback)
 		{
 			Proc("blame", fileName, callback);
diff --git a/src/Main/Base/Test/NRefactoryResolverTests.cs b/src/Main/Base/Test/NRefactoryResolverTests.cs
index 487649da4a..3fe76c1f70 100644
--- a/src/Main/Base/Test/NRefactoryResolverTests.cs
+++ b/src/Main/Base/Test/NRefactoryResolverTests.cs
@@ -2762,5 +2762,27 @@ class Test {
 			Assert.AreEqual("System.Nullable.Value", rr.ResolvedMember.FullyQualifiedName);
 			Assert.AreEqual("System.Int32", rr.ResolvedMember.ReturnType.FullyQualifiedName);
 		}
+		
+		
+		[Test]
+		public void MethodHidesEvent()
+		{
+			// see SD2-1542
+			string program = @"using System;
+class Test : Form {
+	public Test() {
+		
+	}
+	void KeyDown(object sender, EventArgs e) {}
+}
+class Form {
+	public event EventHandler KeyDown;
+}";
+			var mrr = Resolve<MemberResolveResult>(program, "base.KeyDown", 4);
+			Assert.AreEqual("Form.KeyDown", mrr.ResolvedMember.FullyQualifiedName);
+			
+			var mgrr = Resolve<MethodGroupResolveResult>(program, "this.KeyDown", 4);
+			Assert.AreEqual("Test.KeyDown", mgrr.GetMethodIfSingleOverload().FullyQualifiedName);
+		}
 	}
 }
diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/MemberLookupHelper.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/MemberLookupHelper.cs
index 23ffa7e264..88dc7db1d1 100644
--- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/MemberLookupHelper.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/MemberLookupHelper.cs
@@ -135,7 +135,6 @@ namespace ICSharpCode.SharpDevelop.Dom
 			// base most member => most derived member
 			//Dictionary<IMember, IMember> overrideDict = new Dictionary<IMember, IMember>();
 			
-			bool handledNonMethod = false;
 			HashSet<IMethod> handledMethods = new HashSet<IMethod>(new SignatureComparer());
 			Dictionary<IMethod, IMethod> overrideMethodDict = new Dictionary<IMethod, IMethod>(new SignatureComparer());
 			IMember nonMethodOverride = null;
@@ -171,8 +170,8 @@ namespace ICSharpCode.SharpDevelop.Dom
 								}
 							}
 						} else {
-							if (!handledNonMethod) {
-								handledNonMethod = true;
+							// non-methods are only available if they aren't hidden by something else
+							if (allResults.Count == 0) {
 								results.Add(nonMethodOverride ?? m);
 							}
 						}
diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/ReflectionLayer/DomPersistence.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/ReflectionLayer/DomPersistence.cs
index f8ebc0631d..cefea697b9 100644
--- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/ReflectionLayer/DomPersistence.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/ReflectionLayer/DomPersistence.cs
@@ -70,7 +70,8 @@ namespace ICSharpCode.SharpDevelop.Dom
 		
 		public ReflectionProjectContent LoadProjectContent(string cacheFileName)
 		{
-			using (FileStream fs = new FileStream(cacheFileName, FileMode.Open, FileAccess.Read)) {
+			using (FileStream fs = new FileStream(cacheFileName, FileMode.Open, FileAccess.Read,
+			                                      FileShare.Read | FileShare.Delete, 4096, FileOptions.SequentialScan)) {
 				return LoadProjectContent(fs);
 			}
 		}