Merge remote-tracking branch 'refs/remotes/lz4/dev' into dev
authorPrzemyslaw Skibinski <inikep@gmail.com>
Fri, 10 Mar 2017 19:43:53 +0000 (20:43 +0100)
committerPrzemyslaw Skibinski <inikep@gmail.com>
Fri, 10 Mar 2017 19:43:53 +0000 (20:43 +0100)

Trivial merge