Merge branch 'master' of github.com:laanwj/bitcoin-qt