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

Trivial merge