Merge remote-tracking branch 'mjb/prefs_interface'