Add timestamps to messages
Merge pull request #1451 from cmouse/test-timestamps

Add timestamps to messages