Merge branch 'master' into medvedev/oc-11785
authorMax Medvedev <maxim.medvedev@jetbrains.com>
Tue, 19 Apr 2016 08:58:36 +0000 (11:58 +0300)
committerMax Medvedev <maxim.medvedev@jetbrains.com>
Tue, 19 Apr 2016 08:58:36 +0000 (11:58 +0300)

Trivial merge