Merge branch 'master' into dev/jmandereau

* master:
  Re-enable @version macro.
  add reminder.
  Minor policy update.
  Small updates.
  Updates from Ralph.
  MusicXML: Add double-dotted notes to duration test
  MusicXML: Change time signature in duration test file, so it looks better
  MusicXML: Add support for longa and breve notes, fix error messages
  Fix alignment problem with text crescendi
  Typo in comment
  move ignore-collision to note-column-interface
  Update from Trevor.

Conflicts:

	Documentation/user/writing-texinfo.txt