Merge branch '10812-log-merge' refs #10812
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 23 Jan 2017 15:29:01 +0000 (10:29 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 23 Jan 2017 15:29:01 +0000 (10:29 -0500)

Trivial merge