Merge branch 'master' into bor

accounts/abi/abi_test.go

accounts/abi/method.go

accounts/accounts.go

build/ci.go

cmd/faucet/faucet.html

cmd/faucet/website.go

cmd/geth/chaincmd.go

cmd/geth/main.go

cmd/geth/usage.go

cmd/swarm/export_test.go

cmd/utils/cmd.go

cmd/utils/flags.go

common/size.go

consensus/clique/clique.go

consensus/clique/snapshot.go

consensus/ethash/sealer.go

console/prompter.go

core/blockchain.go

core/blockchain_test.go

core/error.go