Merge remote-tracking branch 'origin/master'
authorMaxim.Mossienko <Maxim.Mossienko@jetbrains.com>
Mon, 19 Jan 2015 16:20:55 +0000 (17:20 +0100)
committerMaxim.Mossienko <Maxim.Mossienko@jetbrains.com>
Mon, 19 Jan 2015 16:20:55 +0000 (17:20 +0100)

Trivial merge