Merge remote-tracking branch 'origin/master'
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Wed, 15 Jun 2016 08:23:24 +0000 (11:23 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Wed, 15 Jun 2016 08:23:24 +0000 (11:23 +0300)

Trivial merge