Merge branch 'dev'
Stopping animation when we've run out of frames to display