Merge branch 'dev' into optlz4opt
authorYann Collet <cyan@fb.com>
Fri, 24 Mar 2017 18:00:40 +0000 (11:00 -0700)
committerYann Collet <cyan@fb.com>
Fri, 24 Mar 2017 18:00:40 +0000 (11:00 -0700)

Trivial merge