Merge remote-tracking branch 'origin/master' appcode/142.5044
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Mon, 21 Sep 2015 20:47:28 +0000 (23:47 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Mon, 21 Sep 2015 20:47:28 +0000 (23:47 +0300)

Trivial merge