Merge branch 'master' into light-poa

ethcore/light/src/client/header_chain.rs

@@ -42,7 +42,8 @@ use ethcore::engines::epoch::{
 };
 
 use rlp::{Encodable, Decodable, DecoderError, RlpStream, Rlp, UntrustedRlp};
-use util::{H256, H256FastMap, H264, U256, HeapSizeOf, RwLock};
+use heapsize::HeapSizeOf;
+use util::{H256, H256FastMap, H264, U256,  RwLock};
 use util::kvdb::{DBTransaction, KeyValueDB};
 
 use cache::Cache;

ethcore/light/src/client/mod.rs

@@ -374,7 +374,7 @@ impl<T: ChainDataFetcher> Client<T> {
 
 	/// Get blockchain mem usage in bytes.
 	pub fn chain_mem_used(&self) -> usize {
-		use util::HeapSizeOf;
+		use heapsize::HeapSizeOf;
 
 		self.chain.heap_size_of_children()
 	}