Merge branch 'staging' of ssh://git.sv.gnu.org/srv/git/lilypond into staging

diff --combined ly/engraver-init.ly
index c60808371d0fc84bcc2b9f29fc59346def85ec44,1c900d09640f6eee64a7c2bebf415110427feaf0..a786ebcb7e20ecc113a3bd94a57672ba34368745
--- 1/ly/engraver-init.ly
--- 2/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@@ -16,7 -16,7 +16,7 @@@
  %%%% You should have received a copy of the GNU General Public License
  %%%% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
  
- \version "2.17.6"
+ \version "2.17.11"
  
  \context {
    \name "Global"
@@@ -85,7 -85,6 +85,7 @@@
    \consists "Figured_bass_position_engraver"
    \consists "Script_row_engraver"
    \consists "Cue_clef_engraver"
 +  \consists "Fingering_column_engraver"
  
    localKeySignature = #'()
    createSpacing = ##t
@@@ -260,6 -259,7 +260,6 @@@ multiple voices on the same staff.
  
    \consists "Script_engraver"
    \consists "Script_column_engraver"
 -  \consists "Fingering_column_engraver"
    \consists "Rhythmic_column_engraver"
    \consists "Note_spacing_engraver"
    \consists "Spanner_break_forbid_engraver"
@@@ -625,8 -625,8 +625,8 @@@ automatically when an output definitio
  
  %% These defaults should be the same as the rules established in
  %%   scm/time-signature-settings.scm for 4/4 time
-   measureLength = #(ly:make-moment 4 4)
-   baseMoment = #(ly:make-moment 1  4)
+   measureLength = #(ly:make-moment 4/4)
+   baseMoment = #(ly:make-moment 1/4)
    beatStructure = #'(1 1 1 1)
    beamExceptions = #'((end . (((1 . 8) . (4 4))
                                ((1 . 12) . (3 3 3 3)))))