merged changes from ardour2_ui.rc for ardour2-beta12