Merge branch 'maint'

Revert commit 79873390edd26a44cefc2050c7af470a7ed8fd07.
The fix was wrong and gave rise to a different problem - see

    http://thread.gmane.org/gmane.emacs.orgmode/89945

lisp/org-table.el

@@ -443,11 +443,15 @@ available parameters."
 					   "[ \t]*|[ \t]*")))))))
 
 (defvar org-table-clean-did-remove-column nil) ; dynamically scoped
-(defun org-table-clean-before-export (lines)
+(defun org-table-clean-before-export (lines &optional maybe-quoted)
   "Check if the table has a marking column.
 If yes remove the column and the special lines."
-  (let ((special "^[ \t]*| *[#!$*_^/] *|")
-	(ignore "^[ \t]*| *[!$_^/] *|"))
+  (let ((special (if maybe-quoted
+		     "^[ \t]*| *\\\\?[\#!$*_^/ ] *|"
+		   "^[ \t]*| *[\#!$*_^/ ] *|"))
+	(ignore  (if maybe-quoted
+		     "^[ \t]*| *\\\\?[!$_^/] *|"
+		   "^[ \t]*| *[!$_^/] *|")))
     (setq org-table-clean-did-remove-column
 	  (not (memq nil
 		     (mapcar