Merge branch 'integration' into dev
authorkhizmax <libcds.dev@gmail.com>
Tue, 2 Aug 2016 19:08:00 +0000 (22:08 +0300)
committerkhizmax <libcds.dev@gmail.com>
Tue, 2 Aug 2016 19:08:00 +0000 (22:08 +0300)

Trivial merge