Merge branch 'jk/snprintf-truncation'