Cherry-pick log fix
Merge pull request #1 from civisanalytics/log_fix

Cherry-pick log fix