Merge remote-tracking branch 'refs/remotes/lz4/dev' into dev
authorPrzemyslaw Skibinski <inikep@gmail.com>
Tue, 22 Nov 2016 09:38:44 +0000 (10:38 +0100)
committerPrzemyslaw Skibinski <inikep@gmail.com>
Tue, 22 Nov 2016 09:38:44 +0000 (10:38 +0100)

Trivial merge