Merge branch 'Zeke' into robert
Merge branch 'master' into robert
Fix tearing. Fix timeline advancing beyond end.
Merge branch 'robert'