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

util/src/network/discovery.rs

@@ -241,7 +241,7 @@ impl Discovery {
 		self.send_to(packet, address.clone());
 	}
 
-	#[allow(map_clone)]
+	#[cfg_attr(feature="dev", allow(map_clone))]
 	fn nearest_node_entries(target: &NodeId, buckets: &[NodeBucket]) -> Vec<NodeEntry> {
 		let mut found: BTreeMap<u32, Vec<&NodeEntry>> = BTreeMap::new();
 		let mut count = 0;