Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 23 Jun 2015 21:05:43 +0000 (00:05 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 23 Jun 2015 21:05:43 +0000 (00:05 +0300)

Trivial merge