Merge "Get rid of strlcat / strlcpy"