Merge remote-tracking branch 'origin/OC-13477'
authorMax Medvedev <maxim.medvedev@jetbrains.com>
Tue, 31 May 2016 08:02:46 +0000 (11:02 +0300)
committerMax Medvedev <maxim.medvedev@jetbrains.com>
Tue, 31 May 2016 08:02:46 +0000 (11:02 +0300)

Trivial merge