Merge remote-tracking branch 'origin/master' appcode/142.5071 clion/142.5069
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 22 Sep 2015 14:54:28 +0000 (17:54 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 22 Sep 2015 14:54:28 +0000 (17:54 +0300)

Trivial merge