Merge branch 'newtabpage'

3 files changed, 8 insertions, 6 deletions

diff --git a/CHANGES.md b/CHANGES.md
index 4215afa..81fd4f2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,11 @@
 
 All notable changes to this program is documented in this file.
 
+## Unreleased
+
+### Changed
+- Now uses about:blank as the new tab document; this was previously disabled due to [bug 1333736](https://bugzilla.mozilla.org/show_bug.cgi?id=1333736) in Marionette
+
 ## 0.14.0 (2017-01-31)
 
 ### Changed
diff --git a/Cargo.lock b/Cargo.lock
index f60259e..876d0ba 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 [root]
 name = "geckodriver"
-version = "0.13.0"
+version = "0.14.0"
 dependencies = [
  "chrono 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.20.1 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/src/prefs.rs b/src/prefs.rs
index 7640430..102b830 100644
--- a/src/prefs.rs
+++ b/src/prefs.rs
@@ -30,11 +30,8 @@ lazy_static! {
         // Implicitly accept license
         ("browser.EULA.override", Pref::new(true)),
 
-        // Turn off once Marionette can correctly handle error pages,
-        // and does not hang when about:blank gets loaded twice
-        //
-        // (bug 1145668, 1312674)
-        ("browser.newtabpage.enabled", Pref::new(true)),
+        // use about:blank as new tab page
+        ("browser.newtabpage.enabled", Pref::new(false)),
 
         // Assume the about:newtab pages intro panels have been shown
         // to not depend on which test runs first and happens to open