Fixes 1351
Fixes 1353
Merge pull request #1356 from xoppa/various

Small changes in AnimationController