Merge branch 'dev' into lz4fRingBuffer
authorYann Collet <cyan@fb.com>
Wed, 2 May 2018 21:24:24 +0000 (14:24 -0700)
committerYann Collet <cyan@fb.com>
Wed, 2 May 2018 21:24:24 +0000 (14:24 -0700)

Trivial merge