Merge pull request #974 from tobeytailor/timeline

Fixes regression in #968
Fix framesLoaded, again.