Merge pull request #1910 from dajhorn/liblz4-r131