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

Trivial merge