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

Trivial merge