Merge remote-tracking branch 'refs/remotes/lz4/dev' into dev
authorPrzemyslaw Skibinski <inikep@gmail.com>
Tue, 6 Dec 2016 12:44:42 +0000 (13:44 +0100)
committerPrzemyslaw Skibinski <inikep@gmail.com>
Tue, 6 Dec 2016 12:44:42 +0000 (13:44 +0100)

Trivial merge