Merge branch 'release/0.6.4' into develop
Merge pull request #2 from ethereum/develop

Merge branch 'release/0.6.4' into develop