Merge pull request #1456 from titovmaxim/master

Fix for  #1367: allowSameAnimation is not used in setAnimation