Merge remote-tracking branch 'origin/master'
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Mon, 17 Oct 2016 18:52:29 +0000 (21:52 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Mon, 17 Oct 2016 18:52:29 +0000 (21:52 +0300)

Trivial merge