Merge branch 'master' into OC-13477 appcode/146.1762
authorMax Medvedev <maxim.medvedev@jetbrains.com>
Thu, 5 May 2016 12:21:16 +0000 (15:21 +0300)
committerMax Medvedev <maxim.medvedev@jetbrains.com>
Thu, 5 May 2016 12:21:16 +0000 (15:21 +0300)

Trivial merge