Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 26 May 2015 21:16:42 +0000 (00:16 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 26 May 2015 21:16:42 +0000 (00:16 +0300)

Trivial merge