Merge branch 'dev' of github.com:lz4/lz4 into dev
authorCyan4973 <cyan@fb.com>
Sun, 29 Apr 2018 15:47:08 +0000 (08:47 -0700)
committerCyan4973 <cyan@fb.com>
Sun, 29 Apr 2018 15:47:08 +0000 (08:47 -0700)

Trivial merge