Merge branch 'maint'

lisp/org.el

@@ -8740,7 +8740,8 @@ When sorting is done, call `org-after-sorting-entries-or-items-hook'."
       (setq start (point)
 	    end (progn (org-end-of-subtree t t)
 		       (or (bolp) (insert "\n"))
-		       (org-back-over-empty-lines)
+		       (when (>= (org-back-over-empty-lines) 1)
+			 (forward-line 1))
 		       (point))
 	    what "children")
       (goto-char start)