Merge branch 'master' into lilypond/translation

* master:
  Clean up docs makefiles
  Update texinfo.tex from Texinfo CVS
  lilypond-book: touch output files in all formats
  Update from Ralph.
  Fix web compile.
  bump version.
  Set side-axis for InstrumentSwitch grobs
  MusicXML: Properly detect when a node is the lxml tree is a comment