Merge remote-tracking branch 'origin/master'
authorVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Fri, 21 Aug 2015 10:55:01 +0000 (13:55 +0300)
committerVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Fri, 21 Aug 2015 10:55:01 +0000 (13:55 +0300)

Trivial merge