Merge remote-tracking branch 'origin/master'
authorMaxim.Mossienko <Maxim.Mossienko@jetbrains.com>
Wed, 4 Feb 2015 10:53:30 +0000 (11:53 +0100)
committerMaxim.Mossienko <Maxim.Mossienko@jetbrains.com>
Wed, 4 Feb 2015 10:53:30 +0000 (11:53 +0100)

Trivial merge