humorist (n.)

1590s, "person with the ability to entertain by comical fancy, humorous talker or writer," also "person who acts according to his humors" (obsolete), from humor (n.) + -ist. Perhaps on model of Middle French humoriste.