Merge branch 'ew/ban-strncat'