Merge remote-tracking branch 'origin/master'
authorAlexander Koshevoy <Alexander.Koshevoy@jetbrains.com>
Fri, 7 Aug 2015 14:36:23 +0000 (17:36 +0300)
committerAlexander Koshevoy <Alexander.Koshevoy@jetbrains.com>
Fri, 7 Aug 2015 14:36:23 +0000 (17:36 +0300)

Trivial merge