Merge branch 'jk/log-warn-on-bogus-encoding' into maint