Merge branch 'master' into roslyn

Conflicts:
	main/external/fsharpbinding
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs
	main/src/addins/NUnit/Services/NUnitProjectTestSuite.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/TaskStore.cs
	version-checks

2 files changed, 14 insertions, 3 deletions

diff --git a/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/TemplateGenerator.cs b/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/TemplateGenerator.cs
index 3ca28d88c2..3396e1342f 100644
--- a/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/TemplateGenerator.cs
+++ b/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/TemplateGenerator.cs
@@ -237,9 +237,9 @@ namespace Mono.TextTemplating
 				return path;
 			var dir = Path.GetDirectoryName (inputFile);
 			var test = Path.Combine (dir, path);
-			if (File.Exists (test))
+			if (File.Exists (test) || Directory.Exists (test))
 				return test;
-			return null;
+			return path;
 		}
 		
 		#endregion
@@ -262,7 +262,7 @@ namespace Mono.TextTemplating
 			content = "";
 			location = ResolvePath (requestFileName);
 			
-			if (location == null) {
+			if (location == null || !File.Exists (location)) {
 				foreach (string path in includePaths) {
 					string f = Path.Combine (path, requestFileName);
 					if (File.Exists (f)) {
diff --git a/main/src/addins/TextTemplating/TextTransform/TextTransform.cs b/main/src/addins/TextTemplating/TextTransform/TextTransform.cs
index d1b061d07c..e4f239e320 100644
--- a/main/src/addins/TextTemplating/TextTransform/TextTransform.cs
+++ b/main/src/addins/TextTemplating/TextTransform/TextTransform.cs
@@ -37,6 +37,17 @@ namespace Mono.TextTemplating
 		const string name ="TextTransform.exe";
 		
 		public static int Main (string[] args)
+		{

+			try {

+				return MainInternal(args);

+			}

+			catch (Exception e) {

+				Console.Error.WriteLine(e);

+				return -1;

+			}

+		}
+
+		private static int MainInternal (string[] args)
 		{
 			if (args.Length == 0) {
 				ShowHelp (true);