Merge remote-tracking branch 'origin/master'
authorAnna Kozlova <anna.kozlova@jetbrains.com>
Mon, 13 Oct 2014 17:45:04 +0000 (19:45 +0200)
committerAnna Kozlova <anna.kozlova@jetbrains.com>
Mon, 13 Oct 2014 17:45:04 +0000 (19:45 +0200)

Trivial merge