sync latest changes from origin-aggregated-logging #12

Closed richm closed 7 years ago