Merge branch '6347-log-timestamps'
authorTom Clegg <tom@curoverse.com>
Fri, 24 Feb 2017 19:43:33 +0000 (14:43 -0500)
committerTom Clegg <tom@curoverse.com>
Fri, 24 Feb 2017 19:43:33 +0000 (14:43 -0500)
closes #6347


Trivial merge