Merge branch 'master' into uta/UDLrename
authorAlexey Utkin <alexey.utkin@jetbrains.com>
Thu, 6 Oct 2016 11:39:44 +0000 (14:39 +0300)
committerAlexey Utkin <alexey.utkin@jetbrains.com>
Thu, 6 Oct 2016 11:39:44 +0000 (14:39 +0300)

Trivial merge