Index: libs/ardour/ardour/rc_configuration_vars.h
===================================================================
--- libs/ardour/ardour/rc_configuration_vars.h	(revision 11476)
+++ libs/ardour/ardour/rc_configuration_vars.h	(working copy)
@@ -174,6 +174,7 @@
 CONFIG_VARIABLE (bool, never_display_periodic_midi, "never-display-periodic-midi", true)
 CONFIG_VARIABLE (bool, sound_midi_notes, "sound-midi-notes", false)
 CONFIG_VARIABLE (bool, use_plugin_own_gui, "use-plugin-own-gui", true)
+CONFIG_VARIABLE (uint32_t, max_recent_sessions, "max-recent-sessions", 10)
 
 /* denormal management */
 
@@ -185,4 +186,4 @@
 CONFIG_VARIABLE (bool, show_zoom_tools, "show-zoom-tools", true)
 CONFIG_VARIABLE (bool, widget_prelight, "widget-prelight", true)
 CONFIG_VARIABLE (std::string, mixer_strip_visibility, "mixer-strip-visibility", "PhaseInvert,SoloSafe,SoloIsolated,Group,MeterPoint")
-CONFIG_VARIABLE (bool, allow_non_quarter_pulse, "allow-non-quarter-pulse", false)
+CONFIG_VARIABLE (bool, allow_non_quarter_pulse, "allow-non-quarter-pulse", true)
Index: libs/ardour/recent_sessions.cc
===================================================================
--- libs/ardour/recent_sessions.cc	(revision 11476)
+++ libs/ardour/recent_sessions.cc	(working copy)
@@ -28,6 +28,7 @@
 #include "pbd/error.h"
 
 #include "ardour/configuration.h"
+#include "ardour/rc_configuration.h"
 #include "ardour/filesystem_paths.h"
 #include "ardour/recent_sessions.h"
 #include "ardour/utils.h"
@@ -130,8 +131,10 @@
 
 	rs.push_front (newpair);
 
-	if (rs.size() > 10) {
-		rs.erase(rs.begin()+10, rs.end());
+	uint32_t max_recent_sessions = Config->get_max_recent_sessions();
+
+	if (rs.size() > max_recent_sessions) {
+		rs.erase(rs.begin()+max_recent_sessions, rs.end());
 	}
 
 	return ARDOUR::write_recent_sessions (rs);
Index: gtk2_ardour/rc_option_editor.cc
===================================================================
--- gtk2_ardour/rc_option_editor.cc	(revision 11476)
+++ gtk2_ardour/rc_option_editor.cc	(working copy)
@@ -919,6 +919,15 @@
 			    sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_session_parent_dir)
 			    ));
 
+	add_option (_("Misc"),
+	     new SpinOption<uint32_t> (
+		     "max-recent-sessions",
+		     _("Maximum number of recent sessions"),
+		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_max_recent_sessions),
+		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_max_recent_sessions),
+		     0, 1000, 1, 20
+		     ));
+
 	add_option (_("Misc"), new OptionEditorHeading (_("Click")));
 
 	add_option (_("Misc"), new ClickOptions (_rc_config, this));