jocular

(adj) given to jesting ; habitually jolly
Although everyone appreciated Oxana's sense of humor in the office, her jocular nature was sometimes out of place during board meetings.