Merge remote-tracking branch 'origin/master'
authorliana.bakradze <liana.bakradze@jetbrains.com>
Mon, 14 Mar 2016 12:08:24 +0000 (15:08 +0300)
committerliana.bakradze <liana.bakradze@jetbrains.com>
Mon, 14 Mar 2016 12:08:24 +0000 (15:08 +0300)

Trivial merge