@Stefan: I am copying you on this as the above commit that fixes this in org-mode git was related to a backport commit from emacs git: http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=ef9637030456b153fd834f4c9202a9264d5ef18d

So probably the same 44c8cd fix has to be applied to the org.el in emacs-25/master branches too?