Added timeline type.
Merge branch 'origin/master'