Merge branch 'v0.6.x'

# Conflicts:
#	serde/src/de/impls.rs
#	serde_codegen/src/de.rs

serde_tests/tests/test_de.rs

@@ -1,4 +1,5 @@
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
+use std::path::PathBuf;
 
 use num::FromPrimitive;
 use num::bigint::{BigInt, BigUint};
@@ -593,4 +594,9 @@ declare_tests! {
             Token::SeqEnd,
         ],
     }
+    test_path_buf {
+        PathBuf::from("/usr/local/lib") => vec![
+            Token::String("/usr/local/lib".to_owned()),
+        ],
+    }
 }