Merge pull request #1268 from dajhorn/liblz4