Merge branch 'strlcpy' into 'master'