Merge branch 'ah/log-decorate-default-to-auto'