From: Paul Cruz <paulcruz74@fb.com>
Date: Mon, 31 Jul 2017 18:43:40 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/dev' into dev
X-Git-Tag: v1.3.1^2~12^2^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf92221671bd8411da435123cdb00fb841e22415;p=thirdparty%2Fzstd.git

Merge remote-tracking branch 'upstream/dev' into dev
---

cf92221671bd8411da435123cdb00fb841e22415