Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 16 Apr 2015 17:43:10 +0000 (20:43 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 16 Apr 2015 17:43:10 +0000 (20:43 +0300)

Trivial merge