Merge pull request #897 from spbnick/strlcpy_fix