Merge branch 'beta' into mergemaster

# Conflicts:
#	src/main.cpp

qa/rpc-tests/getblocktemplate_longpoll.py

@@ -4,8 +4,10 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import *
+from test_framework.authproxy import AuthServiceProxy
+from test_framework.util import random_transaction
 
+from decimal import Decimal
 
 def check_array_result(object_array, to_match, expected):
     """