Merge branch 'master' into kvdb_split

ethcore/light/src/cache.rs

@@ -29,7 +29,7 @@ use time::{SteadyTime, Duration};
 use heapsize::HeapSizeOf;
 use bigint::prelude::U256;
 use bigint::hash::H256;
-use util::cache::MemoryLruCache;
+use memory_cache::MemoryLruCache;
 
 /// Configuration for how much data to cache.
 #[derive(Debug, Clone, PartialEq, Eq)]

ethcore/light/src/lib.rs

@@ -94,6 +94,7 @@ extern crate triehash;
 extern crate kvdb;
 extern crate kvdb_memorydb;
 extern crate kvdb_rocksdb;
+extern crate memory_cache;
 
 #[cfg(feature = "ipc")]
 extern crate ethcore_ipc as ipc;