Merge remote-tracking branch 'origin/master' into medvedev/oc-11785
authorMax Medvedev <maxim.medvedev@jetbrains.com>
Wed, 4 May 2016 16:55:29 +0000 (19:55 +0300)
committerMax Medvedev <maxim.medvedev@jetbrains.com>
Wed, 4 May 2016 16:55:29 +0000 (19:55 +0300)

Trivial merge