Merge remote-tracking branch 'origin/master' appcode/162.493 appcode/162.494 clion/162.495
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Thu, 26 May 2016 06:59:48 +0000 (09:59 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Thu, 26 May 2016 06:59:48 +0000 (09:59 +0300)

Trivial merge