Apache log to combined format
Merge branch 'log-format'