Remove trailing whitespace after the timestamp.
Merge branch 'develop' into page-leaf-cell