Some changes to master didn't carry into character-class-and-animation. Merging them over. #2

Closed Hassurunous closed 6 years ago