Merge remote-tracking branch 'origin/master'
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Tue, 14 Jun 2016 08:05:03 +0000 (11:05 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Tue, 14 Jun 2016 08:05:03 +0000 (11:05 +0300)

Trivial merge