Merge remote-tracking branch 'origin/master' idea/163.5397
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 29 Sep 2016 10:52:13 +0000 (12:52 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 29 Sep 2016 10:52:13 +0000 (12:52 +0200)

Trivial merge