Merge remote-tracking branch 'refs/remotes/facebook/dev' into dev11

# Conflicts:
#	lib/Makefile

diff --cc lib/Makefile
index cfc3028ebcf386d063b32f263ddc9c91bcd87628,a7df44f2febaaf6455e5513ad02e57504b17f830..a928c60c0e6918cad542b1cbf3419adc4e0b91e9
--- 1/lib/Makefile
--- 2/lib/Makefile
+++ b/lib/Makefile
@@@ -73,11 -73,9 +73,11 @@@ $(LIBZSTD): LDFLAGS += -shared -fPI
  $(LIBZSTD): $(ZSTD_FILES)
        @echo compiling dynamic library $(LIBVER)
        @$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
 +ifeq (,$(filter Windows%,$(OS)))
        @echo creating versioned links
-       @ln -sf $@.$(SHARED_EXT_VER) libzstd.$(SHARED_EXT_MAJOR)
-       @ln -sf $@.$(SHARED_EXT_VER) libzstd.$(SHARED_EXT)
+       @ln -sf $(LIBZSTD) libzstd.$(SHARED_EXT_MAJOR)
+       @ln -sf $(LIBZSTD) libzstd.$(SHARED_EXT)
 +endif
  
  libzstd : $(LIBZSTD)
  

diff --cc programs/zstdcli.c
Simple merge