Merge branch 'master' into cairocanvas

diff --cc gtk2_ardour/ardour_ui.cc
Simple merge

diff --cc gtk2_ardour/ardour_ui.h
Simple merge

diff --cc gtk2_ardour/editor.cc
index c140ef71abe341021453d7043ae4de0178c4ac72,fc4b6f4d6c4fe6ac7461bba5189ff4aed14475f9..c7bdfc15daa526c9197627672d6fccf4de3ae60a
--- 1/gtk2_ardour/editor.cc
--- 2/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@@ -363,12 -359,13 +363,13 @@@ Editor::Editor (
  
        sfbrowser = 0;
  
 -      location_marker_color = ARDOUR_UI::config()->canvasvar_LocationMarker.get();
 -      location_range_color = ARDOUR_UI::config()->canvasvar_LocationRange.get();
 -      location_cd_marker_color = ARDOUR_UI::config()->canvasvar_LocationCDMarker.get();
 -      location_loop_color = ARDOUR_UI::config()->canvasvar_LocationLoop.get();
 -      location_punch_color = ARDOUR_UI::config()->canvasvar_LocationPunch.get();
 +      location_marker_color = ARDOUR_UI::config()->get_canvasvar_LocationMarker();
 +      location_range_color = ARDOUR_UI::config()->get_canvasvar_LocationRange();
 +      location_cd_marker_color = ARDOUR_UI::config()->get_canvasvar_LocationCDMarker();
 +      location_loop_color = ARDOUR_UI::config()->get_canvasvar_LocationLoop();
 +      location_punch_color = ARDOUR_UI::config()->get_canvasvar_LocationPunch();
  
+       zoom_focus = ZoomFocusLeft;
        _edit_point = EditAtMouse;
        _internal_editing = false;
        current_canvas_cursor = 0;