Merge branch 'master' into continue_separatin_fetcher_with_light_backend

core/client/src/light/call_executor.rs

@@ -27,8 +27,8 @@ use sr_primitives::generic::BlockId;
 use sr_primitives::traits::{One, Block as BlockT, Header as HeaderT, NumberFor};
 use state_machine::{
 	self, Backend as StateBackend, CodeExecutor, OverlayedChanges,
-	ExecutionStrategy, create_proof_check_backend,
-	execution_proof_check_on_trie_backend, ExecutionManager,
+	ExecutionStrategy, ChangesTrieTransaction, create_proof_check_backend,
+	execution_proof_check_on_trie_backend, ExecutionManager, NeverOffchainExt
 };
 use hash_db::Hasher;