Put time first so it aligns neatly.
Merge branch 'master' into pre-2.1