Merge pull request #470 from micmac1/mas-pcapsipd-strlcpy