Merge remote-tracking branch 'refs/remotes/lz4/dev' into dev
authorPrzemyslaw Skibinski <inikep@gmail.com>
Thu, 3 Nov 2016 12:12:51 +0000 (13:12 +0100)
committerPrzemyslaw Skibinski <inikep@gmail.com>
Thu, 3 Nov 2016 12:12:51 +0000 (13:12 +0100)

Trivial merge