diff --git a/source/blender/python/epy_doc_gen.py b/source/blender/python/epy_doc_gen.py
index 57c67233bf2..8630a0c8f8e 100644
--- a/source/blender/python/epy_doc_gen.py
+++ b/source/blender/python/epy_doc_gen.py
@@ -69,11 +69,11 @@ def write_func(rna, ident, out, func_type):
 	# Operators and functions work differently
 	if func_type=='OPERATOR':
 		rna_func_name = rna_struct.identifier
-		rna_func_desc = rna_struct.description
+		rna_func_desc = rna_struct.description.strip()
 		items = rna_struct.properties.items()
 	else:
 		rna_func_name = rna.identifier
-		rna_func_desc = rna.description
+		rna_func_desc = rna.description.strip()
 		items = rna.parameters.items()
 	
 	for rna_prop_identifier, rna_prop in items:
@@ -94,7 +94,7 @@ def write_func(rna, ident, out, func_type):
 		array_str = get_array_str(length)
 		
 		kw_type_str= "@type %s: %s%s" % (rna_prop_identifier, rna_prop_type, array_str)
-		kw_param_str= "@param %s: %s" % (rna_prop_identifier, rna_prop.description)
+		kw_param_str= "@param %s: %s" % (rna_prop_identifier, rna_prop.description.strip())
 		kw_param_set = False
 		
 		if func_type=='OPERATOR':
@@ -205,7 +205,7 @@ def rna2epy(target_path):
 		out.write(ident+ '\t"""\n')
 		
 		title = 'The %s Object' % rna_struct.name
-		description = rna_struct.description
+		description = rna_struct.description.strip()
 		out.write(ident+ '\t%s\n' %  title)
 		out.write(ident+ '\t%s\n' %  ('=' * len(title)))
 		out.write(ident+ '\t\t%s\n' %  description)
@@ -238,7 +238,7 @@ def rna2epy(target_path):
 			if rna_prop_identifier=='rna_type':
 				continue
 			
-			rna_desc = rna_prop.description
+			rna_desc = rna_prop.description.strip()
 			
 			if rna_desc: rna_words.update(rna_desc.split())
 			if not rna_desc: rna_desc = rna_prop.name
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 473b3d42095..707c5769357 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -260,6 +260,14 @@ int BPY_run_python_script( bContext *C, const char *fn, struct Text *text, struc
 		py_result =  PyEval_EvalCode( text->compiled, py_dict, py_dict );
 		
 	} else {
+#if 0
+		char *pystring;
+		pystring= malloc(strlen(fn) + 32);
+		pystring[0]= '\0';
+		sprintf(pystring, "exec(open(r'%s').read())", fn);
+		py_result = PyRun_String( pystring, Py_file_input, py_dict, py_dict );
+		free(pystring);
+#else
 		FILE *fp= fopen(fn, "r");		
 		if(fp) {
 			py_result = PyRun_File(fp, fn, Py_file_input, py_dict, py_dict);
@@ -269,7 +277,7 @@ int BPY_run_python_script( bContext *C, const char *fn, struct Text *text, struc
 			PyErr_Format(PyExc_SystemError, "Python file \"%s\" could not be opened: %s", fn, strerror(errno));
 			py_result= NULL;
 		}
-		
+#endif
 	}
 	
 	if (!py_result) {