Merge branch 'dev' into partialDecode
authorYann Collet <cyan@fb.com>
Mon, 10 Sep 2018 22:44:40 +0000 (15:44 -0700)
committerYann Collet <cyan@fb.com>
Mon, 10 Sep 2018 22:44:40 +0000 (15:44 -0700)

Trivial merge