merge
Merge branch 'master' of https://github.com/btc-pki/bitcoin

Conflicts:
	src/alias.cpp
e.py