Merge branch 'dev' into jl777

diff --cc doc/payment-api.md
Simple merge

diff --cc doc/tor.md
Simple merge

diff --cc doc/zmq.md
Simple merge

diff --cc src/chainparams.cpp
Simple merge

diff --cc src/init.cpp
Simple merge

diff --cc src/rpcrawtransaction.cpp
Simple merge

diff --cc src/rpcserver.cpp
Simple merge

diff --cc src/wallet/rpcwallet.cpp
Simple merge