Merge remote-tracking branch 'origin/master'
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Wed, 20 Apr 2016 07:24:42 +0000 (10:24 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Wed, 20 Apr 2016 07:24:42 +0000 (10:24 +0300)

Trivial merge