Merge remote-tracking branch 'origin/master'
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Thu, 15 Oct 2015 11:50:52 +0000 (14:50 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Thu, 15 Oct 2015 11:50:52 +0000 (14:50 +0300)

Trivial merge