Merge remote-tracking branch 'origin/master'
authorDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Tue, 19 Jul 2016 09:03:01 +0000 (12:03 +0300)
committerDmitry Batkovich <dmitry.batkovich@jetbrains.com>
Tue, 19 Jul 2016 09:03:01 +0000 (12:03 +0300)

Trivial merge