Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 22 Jan 2015 12:57:21 +0000 (15:57 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Thu, 22 Jan 2015 12:57:21 +0000 (15:57 +0300)

Trivial merge