Merge remote-tracking branch 'origin/master'
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Mon, 16 Feb 2015 22:39:50 +0000 (01:39 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Mon, 16 Feb 2015 22:39:50 +0000 (01:39 +0300)

Trivial merge