Close prefs. window before terminating app
Merge branch 'master' into builds
7.149