Merge remote-tracking branch 'origin/master' appcode/163.5074 clion/163.5075
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 23 Sep 2016 14:54:41 +0000 (17:54 +0300)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 23 Sep 2016 14:54:41 +0000 (17:54 +0300)

Trivial merge