Merge branch 'master' into OC-13477 appcode/162.496
authorMax Medvedev <maxim.medvedev@jetbrains.com>
Thu, 26 May 2016 08:01:27 +0000 (11:01 +0300)
committerMax Medvedev <maxim.medvedev@jetbrains.com>
Thu, 26 May 2016 08:01:27 +0000 (11:01 +0300)

Trivial merge