Merge remote-tracking branch 'origin/master'
authorMaxim.Mossienko <Maxim.Mossienko@jetbrains.com>
Mon, 9 Mar 2015 18:00:22 +0000 (19:00 +0100)
committerMaxim.Mossienko <Maxim.Mossienko@jetbrains.com>
Mon, 9 Mar 2015 18:00:22 +0000 (19:00 +0100)

Trivial merge