Merge remote-tracking branch 'upstream/master' into feat/uhost

# Conflicts:
#	cmd/api.go
#	cmd/api_repeats_ulhost.go
#	cmd/products.gen.go