Merge remote-tracking branch 'origin/master' appcode/146.1723
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Thu, 5 May 2016 06:31:35 +0000 (09:31 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Thu, 5 May 2016 06:31:35 +0000 (09:31 +0300)

Trivial merge