Merge branch 'develop' of stardiviner/org-mode into master