Merge branch 'master' into fo-6418-dont-export-bigint

# Conflicts:
#	dapps/src/tests/helpers/registrar.rs
#	ethcore/evm/src/interpreter/shared_cache.rs
#	ethcore/light/src/client/header_chain.rs
#	ethcore/light/src/client/mod.rs
#	ethcore/light/src/net/mod.rs
#	ethcore/light/src/on_demand/request.rs
#	ethcore/light/src/on_demand/tests.rs
#	ethcore/light/src/provider.rs
#	ethcore/node_filter/src/lib.rs
#	ethcore/src/block.rs
#	ethcore/src/blockchain/blockchain.rs
#	ethcore/src/client/test_client.rs
#	ethcore/src/engines/authority_round/mod.rs
#	ethcore/src/engines/basic_authority.rs
#	ethcore/src/engines/mod.rs
#	ethcore/src/engines/tendermint/mod.rs
#	ethcore/src/engines/validator_set/contract.rs
#	ethcore/src/engines/validator_set/multi.rs
#	ethcore/src/engines/validator_set/safe_contract.rs
#	ethcore/src/engines/vote_collector.rs
#	ethcore/src/miner/external.rs
#	ethcore/src/miner/miner.rs
#	ethcore/src/miner/service_transaction_checker.rs
#	ethcore/src/miner/work_notify.rs
#	ethcore/src/pod_account.rs
#	ethcore/src/pod_state.rs
#	ethcore/src/snapshot/block.rs
#	ethcore/src/snapshot/consensus/work.rs
#	ethcore/src/snapshot/mod.rs
#	ethcore/src/snapshot/service.rs
#	ethcore/src/spec/spec.rs
#	ethcore/src/state/backend.rs
#	ethcore/src/trace/db.rs
#	ethcore/src/verification/queue/mod.rs
#	ethcore/src/verification/verification.rs
#	parity/informant.rs
#	rpc/src/v1/helpers/dispatch.rs
#	rpc/src/v1/helpers/light_fetch.rs
#	rpc/src/v1/helpers/signing_queue.rs
#	rpc/src/v1/impls/eth.rs
#	rpc/src/v1/impls/eth_filter.rs
#	rpc/src/v1/impls/eth_pubsub.rs
#	rpc/src/v1/impls/light/eth.rs
#	rpc/src/v1/impls/signing.rs
#	rpc/src/v1/tests/helpers/miner_service.rs
#	rpc/src/v1/tests/helpers/snapshot_service.rs
#	rpc/src/v1/tests/helpers/sync_provider.rs
#	rpc/src/v1/tests/mocked/eth.rs
#	stratum/src/lib.rs
#	sync/src/blocks.rs
#	sync/src/chain.rs
#	sync/src/light_sync/mod.rs
#	sync/src/tests/helpers.rs
#	sync/src/tests/snapshot.rs
#	updater/src/updater.rs
#	util/src/lib.rs
#	util/triehash/src/lib.rs

ethcore/src/miner/external.rs

@@ -19,7 +19,7 @@ use std::sync::Arc;
 use std::time::{Instant, Duration};
 use bigint::prelude::U256;
 use bigint::hash::H256;
-use util::Mutex;
+use parking_lot::Mutex;
 
 /// External miner interface.
 pub trait ExternalMinerService: Send + Sync {

ethcore/src/miner/miner.rs

@@ -20,7 +20,9 @@ use std::sync::Arc;
 
 use bigint::prelude::U256;
 use bigint::hash::H256;
+use parking_lot::{Mutex, RwLock};
 use util::*;
+use timer::PerfTimer;
 use using_queue::{UsingQueue, GetAction};
 use account_provider::{AccountProvider, SignError as AccountError};
 use state::State;
@@ -42,6 +44,7 @@ use miner::service_transaction_checker::ServiceTransactionChecker;
 use price_info::{Client as PriceInfoClient, PriceInfo};
 use price_info::fetch::Client as FetchClient;
 use header::{Header, BlockNumber};
+use ansi_term::Colour;
 
 /// Different possible definitions for pending transaction set.
 #[derive(Debug, PartialEq)]

ethcore/src/miner/service_transaction_checker.rs

@@ -21,7 +21,7 @@ use types::ids::BlockId;
 use futures::{future, Future};
 use native_contracts::ServiceTransactionChecker as Contract;
 use bigint::prelude::U256;
-use util::Mutex;
+use parking_lot::Mutex;
 
 const SERVICE_TRANSACTION_CONTRACT_REGISTRY_NAME: &'static str = "service_transaction_checker";
 

ethcore/src/miner/stratum.rs

@@ -29,7 +29,7 @@ use bigint::prelude::U256;
 use bigint::hash::{H64, H256, clean_0x};
 use ethereum::ethash::Ethash;
 use ethash::SeedHashCompute;
-use util::Mutex;
+use parking_lot::Mutex;
 use miner::{self, Miner, MinerService};
 use client::Client;
 use block::IsBlock;

ethcore/src/miner/work_notify.rs

@@ -26,6 +26,7 @@ use ethash::SeedHashCompute;
 use hyper::Url;
 use bigint::prelude::U256;
 use bigint::hash::H256;
+use parking_lot::Mutex;
 use util::*;
 use ethereum::ethash::Ethash;