Merge branch 'converting-to-reporter' into 2016-06
authorGreg Wilson <gvwilson@third-bit.com>
Mon, 27 Jun 2016 01:38:50 +0000 (21:38 -0400)
committerGreg Wilson <gvwilson@third-bit.com>
Mon, 27 Jun 2016 01:38:50 +0000 (21:38 -0400)

Trivial merge