Merge remote-tracking branch 'remotes/atom-symbol/master'