### Eclipse Workspace Patch 1.0
#P jmeterSVN
Index: src/components/org/apache/jmeter/control/IncludeController.java
===================================================================
--- src/components/org/apache/jmeter/control/IncludeController.java	(revision 946591)
+++ src/components/org/apache/jmeter/control/IncludeController.java	(working copy)
@@ -18,14 +18,17 @@
 
 package org.apache.jmeter.control;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.Iterator;
 import java.util.LinkedList;
 
 import org.apache.jmeter.gui.tree.JMeterTreeNode;
 import org.apache.jmeter.save.SaveService;
+import org.apache.jmeter.services.FileServer;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.collections.HashTree;
@@ -116,8 +119,22 @@
         HashTree tree = null;
         if (includePath != null && includePath.length() > 0) {
             try {
-                String file=prefix+includePath;
-                log.info("loadIncludedElements -- try to load included module: "+file);
+                String fileName=prefix+includePath;            
+            	File file = new File(fileName);
+            	log.info("loadIncludedElements -- try to load included module: "+file.getAbsolutePath());
+            	
+            	if(!file.exists()){
+            		//Should probably also verify if the file is a relative path with java.nio.file.Path.isAbsolute()
+            		//Unfortunately this may impose a restriction on the java version used to run JMeter
+            		log.info("loadIncludedElements -failed for: "+file.getAbsolutePath());
+            		file = new File(FileServer.getFileServer().getBaseDir(), includePath);
+            		log.info("loadIncludedElements -Attempting to read it from: "+file.getAbsolutePath());
+            		if(!file.exists()){
+            			log.error("loadIncludedElements -failed for: "+file.getAbsolutePath());
+            			throw new IOException("loadIncludedElements -failed for: "+file.getAbsolutePath());
+            		}
+            	}
+                
                 reader = new FileInputStream(file);
                 tree = SaveService.loadTree(reader);
                 removeDisabledItems(tree);