Merge branch 'master' into medvedev/OC-12584 appcode/144.4011
authorMax Medvedev <maxim.medvedev@jetbrains.com>
Thu, 11 Feb 2016 11:33:36 +0000 (14:33 +0300)
committerMax Medvedev <maxim.medvedev@jetbrains.com>
Thu, 11 Feb 2016 11:33:36 +0000 (14:33 +0300)

Trivial merge