Merge branch 'master' into uta/UDLrename
authorAlexey Utkin <alexey.utkin@jetbrains.com>
Tue, 18 Oct 2016 14:32:08 +0000 (17:32 +0300)
committerAlexey Utkin <alexey.utkin@jetbrains.com>
Tue, 18 Oct 2016 14:32:08 +0000 (17:32 +0300)

Trivial merge