Merge remote-tracking branch 'atom/master'