Merge remote-tracking branch 'origin/master' into vromanik/wsl clion/173.3109
authorVasily Romanikhin <vasily.romanikhin@jetbrains.com>
Sat, 7 Oct 2017 20:15:23 +0000 (23:15 +0300)
committerVasily Romanikhin <vasily.romanikhin@jetbrains.com>
Sat, 7 Oct 2017 20:15:23 +0000 (23:15 +0300)

Trivial merge