Merge branch 'maint'
org-src: Fix org-edit-src-code for empty blocks and block with just an empty line

* lisp/org-src.el (org-edit-src-code): Use marker with insertion type
t to track end and remove hack requiring delete from beg to (1- end).