Merge branch 'new-merge'
authorAleksey Pivovarov <AMPivovarov@gmail.com>
Thu, 20 Aug 2015 09:35:24 +0000 (12:35 +0300)
committerAleksey Pivovarov <AMPivovarov@gmail.com>
Thu, 20 Aug 2015 09:35:24 +0000 (12:35 +0300)

Trivial merge