Merge across forks from synaxon ChromeLogger