Definitions of diplomat:

• noun:   an official engaged in international negotiations
• noun:   a person who deals tactfully with others