Merge branch 'beta' into mergemaster

# Conflicts:
#	src/main.cpp

qa/rpc-tests/rpcbind_test.py

@@ -5,19 +5,20 @@
 
 # Test for -rpcbind, as well as -rpcallowip and -rpcconnect
 
-# Add python-bitcoinrpc to module search path:
+# Dependency: python-bitcoinrpc
+
+from test_framework.util import assert_equal, check_json_precision, \
+    initialize_chain, start_nodes, stop_nodes, wait_bitcoinds, \
+    bitcoind_processes, rpc_port
+from test_framework.authproxy import AuthServiceProxy
+from test_framework.netutil import addr_to_hex, get_bind_addrs, all_interfaces
+
 import os
 import sys
-
-import json
 import shutil
-import subprocess
 import tempfile
 import traceback
 
-from test_framework.util import *
-from test_framework.netutil import *
-
 def run_bind_test(tmpdir, allow_ips, connect_to, addresses, expected):
     '''
     Start a node with requested rpcallowip and rpcbind parameters,
@@ -119,7 +120,6 @@ def main():
     check_json_precision()
 
     success = False
-    nodes = []
     try:
         print("Initializing test directory "+options.tmpdir)
         if not os.path.isdir(options.tmpdir):