Merge branch 'master' into pip-msg

ethcore/light/src/net/status.rs

@@ -373,7 +373,7 @@ pub fn write_announcement(announcement: &Announcement) -> Vec<u8> {
 mod tests {
 	use super::*;
 	use super::super::request_credits::FlowParams;
-	use util::{U256, H256, FixedHash};
+	use util::{U256, H256};
 	use rlp::{RlpStream, Stream ,UntrustedRlp, View};
 
 	#[test]

ethcore/light/src/on_demand/request.rs

@@ -256,7 +256,7 @@ impl TransactionProof {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use util::{MemoryDB, Address, H256, FixedHash};
+	use util::{MemoryDB, Address, H256};
 	use util::trie::{Trie, TrieMut, SecTrieDB, SecTrieDBMut};
 	use util::trie::recorder::Recorder;