Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 8 Sep 2016 19:36:05 +0000 (22:36 +0300)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 8 Sep 2016 19:36:05 +0000 (22:36 +0300)

Trivial merge