Merge pull request #6392 from sartura/geth