Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Mon, 24 Nov 2014 14:04:07 +0000 (17:04 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Mon, 24 Nov 2014 14:04:07 +0000 (17:04 +0300)

Trivial merge