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)
commita1b0149879593df786807afbefb26d4687ebe161
treecde63d8e799050314f1e247ad3c8522e027dbb4b
parenta4a3227c634d8cfd54a23205be727e910032cbe9
parentcb0b666f86ce87d35667e8e23e3775b703a37841
Merge branch '11166-log-name-collision'

closes #11166