Merge with master.
Merge master.
New color scheme and changes to timeline elements.