Animation was renamed
Merge branch 'master' into API10