Merge branch 'release/0.6.0'
Merge pull request #1 from ethereum/master

Merge branch 'release/0.6.0'