Merge branch 'dev' into lz4fRingBuffer
authorYann Collet <cyan@fb.com>
Thu, 3 May 2018 18:54:57 +0000 (11:54 -0700)
committerYann Collet <cyan@fb.com>
Thu, 3 May 2018 18:54:57 +0000 (11:54 -0700)

Trivial merge