Fix timeline tracking for parallel blocks #344

Closed
derppening wants to merge 5 commits from issue-298 into master

5 Commits