Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 29 Jan 2015 14:19:06 +0000 (17:19 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 29 Jan 2015 14:19:06 +0000 (17:19 +0300)

Trivial merge