Merge branch 'master' of https://github.com/bitcoin/bitcoin

diff --cc bitcoin-qt.pro
index 5b9d748,8a735a7..2e4000e
--- 1/bitcoin-qt.pro
--- 2/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@@ -221,12 -221,9 +228,12 @@@ windows:LIBS += -lws2_32 -lgdi3
  windows:DEFINES += WIN32
  windows:RC_FILE = src/qt/res/bitcoin-qt.rc
  
 +macx:HEADERS += src/qt/macdockiconhandler.h
 +macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm
 +macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
  macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0 BOOST_FILESYSTEM_VERSION=3
  macx:ICON = src/qt/res/icons/bitcoin.icns
- macx:TARGET = "Bitcoin Qt"
+ macx:TARGET = "Bitcoin-Qt"
  
  # Set libraries and includes at end, to use platform-defined defaults if not overridden
  INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH