Merge branch 'master' into scratch/org-mode-merge
authorBastien <bzg@gnu.org>
Mon, 3 Jul 2017 07:09:31 +0000 (09:09 +0200)
committerBastien <bzg@gnu.org>
Mon, 3 Jul 2017 07:09:31 +0000 (09:09 +0200)

Trivial merge