Merge remote-tracking branch 'origin/master'
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Wed, 28 Sep 2016 20:34:13 +0000 (23:34 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Wed, 28 Sep 2016 20:34:13 +0000 (23:34 +0300)

Trivial merge