Merge branch 'v0.6.x'

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

serde_codegen/src/de.rs

@@ -949,7 +949,7 @@ fn deserialize_field_visitor(
                     }
                 }
 
-                deserializer.deserialize(__FieldVisitor::<D>{ phantom: PhantomData })
+                deserializer.deserialize_struct_key(__FieldVisitor::<D>{ phantom: PhantomData })
             }
         }
     ).unwrap();