Merging with bitcoin master
Merge branch 'master' of https://github.com/ENikS/bitcoin-dev-msvc