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

21