bug fix in timeline controller
Merge origin/master