Merge branch '2020-10-10-log-improvements'

- Assorted improvements to our log functionality.