Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 5 Sep 2014 16:26:50 +0000 (20:26 +0400)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 5 Sep 2014 16:26:50 +0000 (20:26 +0400)

Trivial merge