Merge branch 'master' into gav-demo

substrate/demo/runtime/src/dispatch.rs

@@ -40,8 +40,6 @@ pub fn proposal(proposal: Proposal) {
 			democracy::privileged::cancel_referendum(a),
 		Proposal::DemocracyStartReferendum(a, b) =>
 			democracy::privileged::start_referendum(*a, b),
-		Proposal::DemocracyCancelReferendum(a) =>
-			democracy::privileged::cancel_referendum(a),
 		Proposal::CouncilSetDesiredSeats(a) =>
 			council::privileged::set_desired_seats(a),
 		Proposal::CouncilRemoveMember(a) =>

substrate/demo/runtime/src/runtime/council_vote.rs

@@ -190,7 +190,6 @@ pub mod internal {
 	pub fn end_block(now: BlockNumber) {
 		while let Some((proposal, proposal_hash)) = take_proposal_if_expiring_at(now) {
 			let tally = take_tally(&proposal_hash);
-			println!("Executing proposal {:?} {:?}", proposal, tally);
 			if let &Proposal::DemocracyCancelReferendum(ref_index) = &proposal {
 				if let (_, 0, 0) = tally {
 					democracy::privileged::cancel_referendum(ref_index);