Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode