Merge remote-tracking branch 'origin/master'
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Tue, 24 May 2016 14:01:58 +0000 (17:01 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Tue, 24 May 2016 14:01:58 +0000 (17:01 +0300)

Trivial merge