Merge branch 'master' of orgmode.org:org-mode

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

contrib/lisp/org-md.el

@@ -334,7 +334,7 @@ a communication channel."
   (let ((first-object (car (org-element-contents paragraph))))
     ;; If paragraph starts with a #, protect it.
     (if (and (stringp first-object) (string-match "\\`#" first-object))
-	(replace-match "\\#" nil t first-object)
+	(replace-regexp-in-string "\\`#" "\\#" contents nil t)
       contents)))
 
 

lisp/org.el

@@ -21078,7 +21078,7 @@ a footnote definition, try to fill the first paragraph within."
 		  ;; in current paragraph nor text before message
 		  ;; body.
 		  ((derived-mode-p 'message-mode)
-		   (let ((body-start (message-goto-body)))
+		   (let ((body-start (save-excursion (message-goto-body))))
 		     (when body-start (setq beg (max body-start beg))))
 		   (when (save-excursion
 			   (re-search-forward