Merge remote-tracking branch 'origin/master'
authorVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Mon, 25 Jan 2016 12:29:26 +0000 (15:29 +0300)
committerVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Mon, 25 Jan 2016 12:29:26 +0000 (15:29 +0300)

Trivial merge