Merge tag 'gc6_0' into ancient-releases
authorIvan Maidanski <ivmai@mail.ru>
Sat, 17 May 2014 14:30:04 +0000 (18:30 +0400)
committerIvan Maidanski <ivmai@mail.ru>
Sat, 17 May 2014 14:30:04 +0000 (18:30 +0400)

Trivial merge