Merge remote-tracking branch 'origin/master' into medvedev/oc-11785
authorMax Medvedev <maxim.medvedev@jetbrains.com>
Mon, 4 Apr 2016 11:53:00 +0000 (14:53 +0300)
committerMax Medvedev <maxim.medvedev@jetbrains.com>
Mon, 4 Apr 2016 11:53:00 +0000 (14:53 +0300)

Trivial merge