Merge remote-tracking branch 'origin/master'
authorVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Tue, 25 Aug 2015 12:40:45 +0000 (15:40 +0300)
committerVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Tue, 25 Aug 2015 12:40:45 +0000 (15:40 +0300)

Trivial merge