Bug 919270, followup fix for cef logging
Merge branch 'master' into newer-attributes