Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 13 Sep 2016 16:13:29 +0000 (19:13 +0300)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 13 Sep 2016 16:13:29 +0000 (19:13 +0300)

Trivial merge