merge changes from wheatley into triviabot