Merge branch 'dev' into coverity_scan
authorYann Collet <cyan@fb.com>
Sun, 14 Jan 2018 06:58:09 +0000 (22:58 -0800)
committerYann Collet <cyan@fb.com>
Sun, 14 Jan 2018 06:58:09 +0000 (22:58 -0800)

Trivial merge