Merge branch 'master' into bgoodr-working-branch
Merge branch 'bgoodr-working-branch' of github.com:bgoodr/org-mode into bgoodr-working-branch