added macro to identify NetSSL_Win
Merge remote-tracking branch 'upstream/develop' into develop