Merge remote-tracking branch 'origin/master'
authorVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Thu, 19 Nov 2015 12:50:00 +0000 (15:50 +0300)
committerVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Thu, 19 Nov 2015 12:50:00 +0000 (15:50 +0300)

Trivial merge