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

dapps/src/apps/fetcher/mod.rs

@@ -32,7 +32,7 @@ use hyper;
 use hyper::status::StatusCode;
 
 use {Embeddable, SyncStatus, random_filename};
-use util::Mutex;
+use parking_lot::Mutex;
 use page::LocalPageEndpoint;
 use handlers::{ContentHandler, ContentFetcherHandler};
 use endpoint::{Endpoint, EndpointPath, Handler};

dapps/src/handlers/fetch.rs

@@ -23,7 +23,7 @@ use std::time::{Instant, Duration};
 use fetch::{self, Fetch};
 use futures::Future;
 use parity_reactor::Remote;
-use util::Mutex;
+use parking_lot::Mutex;
 
 use hyper::{server, Decoder, Encoder, Next, Method, Control};
 use hyper::net::HttpStream;

dapps/src/lib.rs

@@ -24,6 +24,7 @@ extern crate futures;
 extern crate itertools;
 extern crate linked_hash_map;
 extern crate mime_guess;
+extern crate parking_lot;
 extern crate rand;
 extern crate rustc_hex;
 extern crate serde;
@@ -74,7 +75,7 @@ use std::collections::HashMap;
 use std::mem;
 use std::path::PathBuf;
 use std::sync::Arc;
-use util::RwLock;
+use parking_lot::RwLock;
 
 use jsonrpc_http_server::{self as http, hyper, Origin};
 

dapps/src/tests/helpers/fetch.rs

@@ -16,7 +16,7 @@
 
 use std::{io, thread, time};
 use std::sync::{atomic, mpsc, Arc};
-use util::Mutex;
+use parking_lot::Mutex;
 
 use futures::{self, Future};
 use fetch::{self, Fetch};

dapps/src/tests/helpers/registrar.rs

@@ -21,7 +21,8 @@ use rustc_hex::FromHex;
 
 use hash_fetch::urlhint::ContractClient;
 use bigint::hash::H256;
-use util::{Bytes, Address, Mutex, ToPretty};
+use util::{Bytes, Address, ToPretty};
+use parking_lot::Mutex;
 
 const REGISTRAR: &'static str = "8e4e9b13d4b45cb0befc93c3061b1408f67316b2";
 const URLHINT: &'static str = "deadbeefcafe0000000000000000000000000000";