Merge branch '11166-log-name-collision'
authorTom Clegg <tom@curoverse.com>
Tue, 7 Mar 2017 15:11:38 +0000 (10:11 -0500)
committerTom Clegg <tom@curoverse.com>
Tue, 7 Mar 2017 15:11:38 +0000 (10:11 -0500)
closes #11166


Trivial merge