Merge remote-tracking branch 'origin/master'
authorAnna Kozlova <anna.kozlova@jetbrains.com>
Mon, 14 Jul 2014 13:36:17 +0000 (15:36 +0200)
committerAnna Kozlova <anna.kozlova@jetbrains.com>
Mon, 14 Jul 2014 13:36:17 +0000 (15:36 +0200)

Trivial merge