Small style tweak
Merge branch 'master' into timeline