Merge remote-tracking branch 'origin/master' appcode/163.3052
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 22 Aug 2016 11:58:50 +0000 (13:58 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 22 Aug 2016 11:58:50 +0000 (13:58 +0200)

Trivial merge