Merge remote-tracking branch 'origin/master'
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Tue, 31 May 2016 13:29:11 +0000 (16:29 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Tue, 31 May 2016 13:29:11 +0000 (16:29 +0300)

Trivial merge