Merge branch 'beta' into mergemaster

# Conflicts:
#	src/main.cpp

qa/rpc-tests/txn_doublespend.py

@@ -8,10 +8,9 @@
 #
 
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import *
-from decimal import Decimal
-import os
-import shutil
+from test_framework.util import assert_equal, connect_nodes, \
+    sync_blocks, gather_inputs
+
 
 class TxnMallTest(BitcoinTestFramework):
 
@@ -77,7 +76,7 @@ class TxnMallTest(BitcoinTestFramework):
             assert_equal(tx2["confirmations"], 0)
 
         # Now give doublespend to miner:
-        mutated_txid = self.nodes[2].sendrawtransaction(doublespend["hex"])
+        self.nodes[2].sendrawtransaction(doublespend["hex"])
         # ... mine a block...
         self.nodes[2].generate(1)