Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11