Merge remote-tracking branch 'origin/master'
authorAnna Kozlova <anna.kozlova@jetbrains.com>
Wed, 10 Sep 2014 10:18:26 +0000 (14:18 +0400)
committerAnna Kozlova <anna.kozlova@jetbrains.com>
Wed, 10 Sep 2014 10:18:26 +0000 (14:18 +0400)

Trivial merge