Use correct option for saving files on switching to terminal (IDEA-118846).
Merge remote-tracking branch 'origin/master'