Merge remote-tracking branch 'origin/master'
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Wed, 1 Jun 2016 06:05:05 +0000 (09:05 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Wed, 1 Jun 2016 06:05:05 +0000 (09:05 +0300)

Trivial merge