doc/org.texi: Update copyright year.
Merge branch 'maint'
org.el (org-edit-special): Check for table.el before checking for Org tables

* org.el (org-edit-special): Check for table.el before
checking for Org tables.

Thanks to Jacobo de Vera for reporting this.
Merge branch 'maint'
org.texi: Update documentation on internal link handling

* org.texi (Handling links): Update the mention to the
obsolete variable `org-link-to-org-use-id' with a mention to
the newer variable `org-id-link-to-org-use-id'.  Mention the
need to load the org-id library.

TINYCHANGE
Merge branch 'maint'
ob-eval.el (org-babel-shell-command-on-region): Use `executable-find' for local `shell-file-name'

* ob-eval.el (org-babel-shell-command-on-region): Use
`executable-find' for local `shell-file-name'.
Merge branch 'maint'
org-element: Small optimization to `org-element-context'

* lisp/org-element.el (org-element-context): Add an optional argument
  so (org-element-context)
  and (org-element-context (org-element-at-point)) are equivalent.
* testing/lisp/test-org-element.el: Add test.
Rewrite `org-edit-special' with Elements

* lisp/org.el (org-edit-special): Rewrite `org-edit-special' using Org
  Elements tools.  Behaviour should be unchanged.
org-e-latex: Added an attribute to inline images

* contrib/lisp/org-e-latex.el (org-e-latex--inline-image): Added an
attribute, :comment-include, to toggle commenting the \includegraphics
call.

Journals sometimes ask for a list of figure captions.
org.el (org-edit-special): Fix typo in docstring

* org.el (org-edit-special): Fix typo in docstring.
* org-id.el (org-id-locations-file):
* org-clock.el (org-clock-persist-file): Fix hardcoded
reference to "~/.emacs.d".

* contrib/lisp/org-track.el (org-track-directory): Fix hardcoded
reference to "~/.emacs.d".
* org-attach.el (org-attach-reveal, org-attach-reveal-in-emacs): Fix the docstrings.
mention elisp as special rowname case.

* doc/org.texi (rownames): Mention elisp as special rowname case.
org-agenda.el (org-get-entries-from-diary): Turn off `diary-file-name-prefix'

* org-agenda.el (org-get-entries-from-diary): Turn off
`diary-file-name-prefix' instead of
`diary-file-name-prefix-function', the former is checked
before the latter.

Thanks to Andreas Merziger for reporting this as Emacs bug#13396.
Merge branch 'maint'
org-element: Correctly interpret timestamps ranges with repeaters

* lisp/org-element.el (org-element-timestamp-interpreter): Interpret
  timestamps ranges with repeaters.
* testing/lisp/test-org-element.el: Add test.
Merge branch 'master' of orgmode.org:org-mode