Copied from org-mode git head
Merge branch 'master' of github.com:brettviren/dot-emacs