Merge remote-tracking branch 'origin/master'
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Tue, 17 May 2016 07:23:39 +0000 (10:23 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Tue, 17 May 2016 07:23:39 +0000 (10:23 +0300)

Trivial merge