Merge remote-tracking branch 'origin/master' idea/142.3996
authorDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Thu, 13 Aug 2015 15:21:11 +0000 (18:21 +0300)
committerDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Thu, 13 Aug 2015 15:21:11 +0000 (18:21 +0300)

Trivial merge