Merge remote-tracking branch 'origin/master' into test2
authorIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 23 Dec 2014 18:53:28 +0000 (21:53 +0300)
committerIlya.Kazakevich <Ilya.Kazakevich@jetbrains.com>
Tue, 23 Dec 2014 18:53:28 +0000 (21:53 +0300)

Trivial merge