Modifying line endings
Merge remote-tracking branch 'origin/stix_ipwatch' into stix_ipwatch