Merge branch 'medvedev/oc-11785'
authorMax Medvedev <maxim.medvedev@jetbrains.com>
Wed, 4 May 2016 18:43:10 +0000 (21:43 +0300)
committerMax Medvedev <maxim.medvedev@jetbrains.com>
Wed, 4 May 2016 18:43:10 +0000 (21:43 +0300)

Trivial merge