Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 9 Apr 2015 21:52:58 +0000 (00:52 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 9 Apr 2015 21:52:58 +0000 (00:52 +0300)

Trivial merge