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

Trivial merge