Merge pull request #1273 from dorkster/fixes

Compare frame counts against parent AnimationSet