Merge branch 'V5-6-patches' into V5-7-patches

* V5-6-patches:
  Use inet_pton onplace of inet_aton to help portability.