Ignore the .userprefs file
Merge remote-tracking branch 'upstream/master' into autoscroll-messages