Merge branch 'dev' into integration
authorkhizmax <libcds.dev@gmail.com>
Wed, 24 Aug 2016 20:09:56 +0000 (23:09 +0300)
committerkhizmax <libcds.dev@gmail.com>
Wed, 24 Aug 2016 20:09:56 +0000 (23:09 +0300)

Trivial merge