Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 29 Jan 2015 13:23:19 +0000 (16:23 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 29 Jan 2015 13:23:19 +0000 (16:23 +0300)

Trivial merge