Merge remote-tracking branch 'origin/master' into OC-13477
authorMax Medvedev <maxim.medvedev@jetbrains.com>
Tue, 17 May 2016 06:16:57 +0000 (09:16 +0300)
committerMax Medvedev <maxim.medvedev@jetbrains.com>
Tue, 17 May 2016 06:16:57 +0000 (09:16 +0300)

Trivial merge