blah I guess it's needed
Merge branch 'master' into Branch_63f790dfe06a0b635ee613e69b6bac1daaaa0a35

Conflicts:
	Scripts/AnimatorData.cs
	Scripts/Classes/AMTake.cs
test