Merge to master for 1.56 release.

Merge OS undef warnings on some compilers, and OS_UNIX not being defined because of OS exclusive detection.