Merge pull request #4580 from jmarshallnz/anim_length_fix