Merge remote-tracking branch 'origin/master'
authorMaxim.Mossienko <Maxim.Mossienko@jetbrains.com>
Tue, 24 Feb 2015 10:39:15 +0000 (11:39 +0100)
committerMaxim.Mossienko <Maxim.Mossienko@jetbrains.com>
Tue, 24 Feb 2015 10:39:15 +0000 (11:39 +0100)

Trivial merge