Merge branch 'beta' into mergemaster

# Conflicts:
#	src/main.cpp

depends/config.site.in

@@ -7,20 +7,12 @@ ac_tool_prefix=${host_alias}-
 if test -z $with_boost; then
   with_boost=$depends_prefix
 fi
-# Disable comparison utility (#592)
-#if test -z $with_comparison_tool; then
-#  with_comparison_tool=$depends_prefix/native/share/BitcoindComparisonTool_jar/BitcoindComparisonTool.jar
-#fi
 
 
 if test -z $enable_wallet && test -n "@no_wallet@"; then
   enable_wallet=no
 fi
 
-if test -z $with_miniupnpc && test -n "@no_upnp@"; then
-  with_miniupnpc=no
-fi
-
 if test x@host_os@ = xdarwin; then
   BREW=no
   PORT=no