Merge remote-tracking branch 'origin/master'
authorVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Mon, 9 Nov 2015 13:58:57 +0000 (16:58 +0300)
committerVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Mon, 9 Nov 2015 13:58:57 +0000 (16:58 +0300)

Trivial merge