added support for empty animations
Merge commit 'f22891b'