Merge remote-tracking branch 'origin/master'
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Thu, 5 May 2016 12:16:08 +0000 (15:16 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Thu, 5 May 2016 12:16:08 +0000 (15:16 +0300)

Trivial merge