Merge pull-request #328
authorAleksey Pivovarov <AMPivovarov@gmail.com>
Fri, 27 Nov 2015 11:13:23 +0000 (14:13 +0300)
committerAleksey Pivovarov <AMPivovarov@gmail.com>
Fri, 27 Nov 2015 11:13:23 +0000 (14:13 +0300)

Trivial merge