Merge branch 'master' into uta/complete-statement clion/146.850
authorAlexey Utkin <alexey.utkin@jetbrains.com>
Fri, 25 Mar 2016 12:55:54 +0000 (15:55 +0300)
committerAlexey Utkin <alexey.utkin@jetbrains.com>
Fri, 25 Mar 2016 12:55:54 +0000 (15:55 +0300)

Trivial merge