Merge branch 'dev' of github.com:Cyan4973/lz4 into dev
authorYann Collet <cyan@fb.com>
Wed, 16 Nov 2016 19:37:05 +0000 (11:37 -0800)
committerYann Collet <cyan@fb.com>
Wed, 16 Nov 2016 19:37:05 +0000 (11:37 -0800)

Trivial merge