Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 21 Oct 2014 15:14:18 +0000 (19:14 +0400)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 21 Oct 2014 15:14:18 +0000 (19:14 +0400)

Trivial merge