Merge branch 'Gaya-8.0.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Mon, 2 Sep 2013 06:42:56 +0000 (10:42 +0400)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Mon, 2 Sep 2013 06:42:56 +0000 (10:42 +0400)

Trivial merge