merge from default
PreferencesRedux
2012-04-23, Frank Dowsett