Merge branch 'master' of github.com:ethcore/parity into discovery

ethcore/src/block_queue.rs

@@ -87,7 +87,7 @@ struct QueueSignal {
 }
 
 impl QueueSignal {
-	#[allow(bool_comparison)]
+	#[cfg_attr(feature="dev", allow(bool_comparison))]
 	fn set(&self) {
 		if self.signalled.compare_and_swap(false, true, AtomicOrdering::Relaxed) == false {
 			self.message_channel.send(UserMessage(SyncMessage::BlockVerified)).expect("Error sending BlockVerified message");