Merge branch 'master' into db/inspection-tool-window appcode/144.4273 clion/144.4274
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Wed, 17 Feb 2016 08:00:12 +0000 (11:00 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Wed, 17 Feb 2016 08:00:12 +0000 (11:00 +0300)

Trivial merge