Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 30 Jan 2015 18:29:04 +0000 (21:29 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 30 Jan 2015 18:29:04 +0000 (21:29 +0300)

Trivial merge