Merge remote-tracking branch 'origin/master' into medvedev/oc-11785 appcode/146.1347
authorMax Medvedev <maxim.medvedev@jetbrains.com>
Thu, 14 Apr 2016 07:41:39 +0000 (10:41 +0300)
committerMax Medvedev <maxim.medvedev@jetbrains.com>
Thu, 14 Apr 2016 07:41:39 +0000 (10:41 +0300)

Trivial merge