Merge "added include for unistd.h that was missing"