Merge branch 'master' into crypto
Jeromy authored
Conflicts:
	routing/dht/dht.go
f5295885