Making sure that Ajax loads only complete when we aren't doing an animation.
Merge remote-tracking branch 'origin/dev' into dev