Merge branch 'master' into medvedev/oc-11785 appcode/146.1142
authorMax Medvedev <maxim.medvedev@jetbrains.com>
Tue, 5 Apr 2016 10:15:32 +0000 (13:15 +0300)
committerMax Medvedev <maxim.medvedev@jetbrains.com>
Tue, 5 Apr 2016 10:15:32 +0000 (13:15 +0300)

Trivial merge