Merge branch 'master' into layer/elisp

This commit is contained in:
Jonas Bernoulli
2018-06-24 14:08:39 -05:00