Merge branch 'master' into uta/complete-statement
authorAlexey Utkin <alexey.utkin@jetbrains.com>
Wed, 16 Mar 2016 09:34:43 +0000 (12:34 +0300)
committerAlexey Utkin <alexey.utkin@jetbrains.com>
Wed, 16 Mar 2016 09:34:43 +0000 (12:34 +0300)

Trivial merge