Merge commit 'bfe5189a6e8c39cbf6e28e725ad6140b0b85b0fd'
Merge branch 'master' of github.com:ethereum/pyethereum
Finalized PoC5 additions
Merge branch 'master' of github.com:ethereum/pyethereum