Merge remote-tracking branch 'origin/master' into refactor_client_api

Conflicts:
	cmd/gear/commands.go