Merge remote-tracking branch 'origin/master' into test2
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 28 Nov 2014 15:00:37 +0000 (18:00 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Fri, 28 Nov 2014 15:00:37 +0000 (18:00 +0300)

Trivial merge