Merge remote-tracking branch 'refs/remotes/lz4/dev' into dev
authorPrzemyslaw Skibinski <inikep@gmail.com>
Wed, 16 Nov 2016 15:21:20 +0000 (16:21 +0100)
committerPrzemyslaw Skibinski <inikep@gmail.com>
Wed, 16 Nov 2016 15:21:20 +0000 (16:21 +0100)
# Conflicts:
# appveyor.yml


Trivial merge