Merge remote-tracking branch 'origin/master'

# Conflicts:
#	adapters/zentotem/params_test.go
#	adapters/zentotem/zentotem.go
#	adapters/zentotem/zentotem_test.go
#	exchange/adapter_builders.go