Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Wed, 11 Feb 2015 12:44:01 +0000 (15:44 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Wed, 11 Feb 2015 12:44:01 +0000 (15:44 +0300)

Trivial merge