Merge branch 'dev' into support128bit
authorYann Collet <cyan@fb.com>
Tue, 18 Sep 2018 00:07:00 +0000 (17:07 -0700)
committerYann Collet <cyan@fb.com>
Tue, 18 Sep 2018 00:07:00 +0000 (17:07 -0700)

Trivial merge