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