Merge remote-tracking branch 'origin/master' idea/163.1629
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 18 Jul 2016 12:26:55 +0000 (14:26 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 18 Jul 2016 12:26:55 +0000 (14:26 +0200)

Trivial merge