diff --git a/atom/browser/api/atom_api_app.cc b/atom/browser/api/atom_api_app.cc
index 1c5c2c04f145..d6d961a08dc4 100644
--- a/atom/browser/api/atom_api_app.cc
+++ b/atom/browser/api/atom_api_app.cc
@@ -22,6 +22,7 @@
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_path.h"
+#include "base/nix/xdg_util.h"
 #include "base/path_service.h"
 #include "brightray/browser/brightray_paths.h"
 #include "content/public/browser/client_certificate_delegate.h"
@@ -155,6 +156,17 @@ void PassLoginInformation(scoped_refptr<LoginHandler> login_handler,
     login_handler->CancelAuth();
 }
 
+bool GetUserDownloadsDirectory(base::FilePath* path) {
+#if defined(OS_LINUX)
+  *path = base::nix::GetXDGUserDirectory("DOWNLOAD", "Downloads");
+  return true;
+#elif defined(OS_MACOSX)
+  return false;
+#elif defined(OS_WIN)
+  return false;
+#endif
+}
+
 }  // namespace
 
 App::App() {
@@ -272,8 +284,11 @@ base::FilePath App::GetPath(mate::Arguments* args, const std::string& name) {
   int key = GetPathConstant(name);
   if (key >= 0)
     succeed = PathService::Get(key, &path);
-  if (!succeed)
+  if (!succeed) {
+    if (name == "downloads" && GetUserDownloadsDirectory(&path))
+      return path;
     args->ThrowError("Failed to get path");
+  }
   return path;
 }
 
diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index 8027fdfa4c1c..ba5dad74f523 100644
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -512,7 +512,7 @@ void NativeWindow::TitleWasSet(content::NavigationEntry* entry,
   FOR_EACH_OBSERVER(NativeWindowObserver,
                     observers_,
                     OnPageTitleUpdated(&prevent_default, text));
-  if (!prevent_default)
+  if (!prevent_default && !is_closed_)
     SetTitle(text);
 }
 
diff --git a/atom/common/native_mate_converters/file_path_converter.h b/atom/common/native_mate_converters/file_path_converter.h
index 468f506de8a3..7df1289e243b 100644
--- a/atom/common/native_mate_converters/file_path_converter.h
+++ b/atom/common/native_mate_converters/file_path_converter.h
@@ -21,6 +21,9 @@ struct Converter<base::FilePath> {
   static bool FromV8(v8::Isolate* isolate,
                      v8::Local<v8::Value> val,
                      base::FilePath* out) {
+    if (val->IsNull())
+      return true;
+
     base::FilePath::StringType path;
     if (Converter<base::FilePath::StringType>::FromV8(isolate, val, &path)) {
       *out = base::FilePath(path);
diff --git a/docs/api/app.md b/docs/api/app.md
index 1edc40fb89ae..b145ce7f01d4 100644
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -241,6 +241,7 @@ You can request the following paths by the name:
 * `userDesktop` The current user's Desktop directory.
 * `exe` The current executable file.
 * `module` The `libchromiumcontent` library.
+* `downloads` User's download directory.
 
 ### `app.setPath(name, path)`
 
diff --git a/docs/api/content-tracing.md b/docs/api/content-tracing.md
index 734e2c47cfb4..aae5306523ae 100644
--- a/docs/api/content-tracing.md
+++ b/docs/api/content-tracing.md
@@ -8,7 +8,12 @@ generated file to view the result.
 ```javascript
 const contentTracing = require('electron').contentTracing;
 
-contentTracing.startRecording('*', contentTracing.DEFAULT_OPTIONS, function() {
+const options = {
+  categoryFilter: '*',
+  traceOptions: 'record-until-full,enable-sampling'
+}
+
+contentTracing.startRecording(options, function() {
   console.log('Tracing started');
 
   setTimeout(function() {