Force quit after zapping cache files to prevent destroying prefs
Merge branch 'zap-cache' into 4.0