diff --git a/python/plugins/sextante/grass/postproc/CMakeLists.txt b/python/plugins/sextante/grass/postproc/CMakeLists.txt
diff --git a/python/plugins/sextante/images/database.png b/python/plugins/sextante/images/database.png
diff --git a/python/plugins/sextante/mmqgisx/mmqgisx_library.py b/python/plugins/sextante/mmqgisx/mmqgisx_library.py
@@ -2243,8 +2243,7 @@ def mmqgisx_merge(qgis, layers, savename, addlayer):
 			#	QMessageBox.critical(qgis.mainWindow(),
 			#		"Merge Layers", "Merged layers must all have same coordinate system")
 			#	return None
-
-		layers.append(layer)
+
 		totalfeaturecount += layer.featureCount()
 
 		# Add any fields not in the composite field list
@@ -2280,19 +2279,18 @@ def mmqgisx_merge(qgis, layers, savename, addlayer):
 		feature = QgsFeature()
 		layer.dataProvider().select(layer.dataProvider().attributeIndexes())
 		layer.dataProvider().rewind()
-                while layer.dataProvider().nextFeature(feature):
+		idx = {}
+		for dindex, dfield in fields.iteritems():				
+			for sindex, sfield in layer.dataProvider().fields().iteritems():
+				if (sfield.name() == dfield.name()) and (sfield.type() == dfield.type()):
+					idx[dindex] = sindex
+		while layer.dataProvider().nextFeature(feature):
 			sattributes = feature.attributeMap()
 			dattributes = {}
 			for dindex, dfield in fields.iteritems():
 				dattributes[dindex] = QVariant(dfield.type())
-				for sindex, sfield in layer.dataProvider().fields().iteritems():
-					if (sfield.name() == dfield.name()) and (sfield.type() == dfield.type()):
-						dattributes[dindex] = sattributes[sindex]
-						break
-
-			#for dindex, dfield in dattributes.iteritems():
-			#	print layer.name() + " (" + str(dindex) + ") " + str(dfield.toString())
-
+				dattributes[dindex] = sattributes[idx[dindex]]
+
 			feature.setAttributeMap(dattributes)
 			outfile.addFeature(feature)
 			featurecount += 1

diff --git a/python/plugins/sextante/parameters/ParameterString.py b/python/plugins/sextante/parameters/ParameterString.py
@@ -26,6 +26,9 @@
 from sextante.parameters.Parameter import Parameter
 
 class ParameterString(Parameter):
+
+    NEWLINE = "\n"
+    ESCAPED_NEWLINE = "\\n"
 
     def __init__(self, name="", description="", default="", multiline = False):
         Parameter.__init__(self, name, description)
@@ -37,11 +40,11 @@ def setValue(self, obj):
         if obj is None:
             self.value = self.default
             return True
-        self.value = str(obj)
+        self.value = str(obj).replace(ParameterString.ESCAPED_NEWLINE,ParameterString.NEWLINE)
         return True
 
     def getValueAsCommandLineParameter(self):
-        return "\"" + str(self.value) + "\""
+        return "\"" + str(self.value.replace(ParameterString.NEWLINE,ParameterString.ESCAPED_NEWLINE)) + "\""
 
     def serialize(self):
         return self.__module__.split(".")[-1] + "|" + self.name + "|" + self.description +\

diff --git a/python/plugins/sextante/saga/description/TableCalculator(Shapes).txt b/python/plugins/sextante/saga/description/TableCalculator(Shapes).txt
diff --git a/python/plugins/sextante/saga/description/TableCalculator.txt b/python/plugins/sextante/saga/description/TableCalculator.txt