Merge branch '0.4.x' into 0.5.0.x

diff --cc src/headers.h
Simple merge

diff --cc src/net.cpp
Simple merge

diff --cc src/net.h
Simple merge

diff --cc src/serialize.h
Simple merge

diff --cc src/wallet.h
Simple merge