Merge remote-tracking branch 'origin/master'
authorMaxim.Mossienko <Maxim.Mossienko@jetbrains.com>
Thu, 15 Jan 2015 14:52:52 +0000 (15:52 +0100)
committerMaxim.Mossienko <Maxim.Mossienko@jetbrains.com>
Thu, 15 Jan 2015 14:52:52 +0000 (15:52 +0100)

Trivial merge