Merge remote-tracking branch 'origin/master' clion/146.475
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Thu, 10 Mar 2016 11:49:21 +0000 (14:49 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Thu, 10 Mar 2016 11:49:21 +0000 (14:49 +0300)

Trivial merge