Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Wed, 25 Feb 2015 19:34:47 +0000 (22:34 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Wed, 25 Feb 2015 19:34:47 +0000 (22:34 +0300)

Trivial merge