Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 2 Sep 2016 18:55:48 +0000 (21:55 +0300)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 2 Sep 2016 18:55:48 +0000 (21:55 +0300)

Trivial merge