ⓐⓓⓓⓘⓝⓖ ⓟⓐⓣⓒⓗ ⓣⓞ ⓓⓞⓒⓢ
ⓐⓓⓓⓘⓝⓖ ⓟⓐⓣⓒⓗ ⓣⓞ ⓓⓞⓒⓢ
Merge branch 'master' of https://github.com/ddavison/atom

* 'master' of https://github.com/ddavison/atom:
  ⓐⓓⓓⓘⓝⓖ ⓟⓐⓣⓒⓗ ⓣⓞ ⓓⓞⓒⓢ

Conflicts:
	docs/publishing-a-package.md
ⓒⓛⓐⓡⓘⓕⓘⓒⓐⓣⓘⓞⓝ
Merge pull request #2380 from ddavison/master

ⓐⓓⓓⓘⓝⓖ ⓟⓐⓣⓒⓗ ⓣⓞ ⓓⓞⓒⓢ