Merge remote-tracking branch 'origin/master' appcode/142.4580
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 3 Sep 2015 14:09:21 +0000 (17:09 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 3 Sep 2015 14:09:21 +0000 (17:09 +0300)

Trivial merge