Merge remote-tracking branch 'origin/master'
authorVassiliy.Kudryashov <Vassiliy.Kudryashov@jetbrains.com>
Tue, 15 Mar 2016 13:25:35 +0000 (16:25 +0300)
committerVassiliy.Kudryashov <Vassiliy.Kudryashov@jetbrains.com>
Tue, 15 Mar 2016 13:25:35 +0000 (16:25 +0300)

Trivial merge