Merge tag 'upstream/2.16.0' into debian

Upstream version 2.16.0

Conflicts:
	Documentation/ja/web.texi
	lily/music-sequence.cc
	scm/lily.scm

diff --cc Documentation/changes.tely
Simple merge

diff --cc Documentation/contributor.texi
Simple merge

diff --cc Documentation/cs/learning.tely
Simple merge

diff --cc Documentation/cs/web.texi
Simple merge

diff --cc Documentation/de/essay.tely
Simple merge

diff --cc Documentation/de/extending.tely
Simple merge

diff --cc Documentation/de/learning.tely
Simple merge

diff --cc Documentation/de/notation.tely
Simple merge

diff --cc Documentation/de/usage.tely
Simple merge

diff --cc Documentation/de/web.texi
Simple merge

diff --cc Documentation/es/changes.tely
Simple merge

diff --cc Documentation/es/essay.tely
Simple merge

diff --cc Documentation/es/extending.tely
Simple merge

diff --cc Documentation/es/learning.tely
Simple merge

diff --cc Documentation/es/notation.tely
Simple merge

diff --cc Documentation/es/usage.tely
Simple merge

diff --cc Documentation/es/web.texi
Simple merge

diff --cc Documentation/essay.tely
Simple merge

diff --cc Documentation/extending.tely
Simple merge

diff --cc Documentation/fr/essay.tely
Simple merge

diff --cc Documentation/fr/learning.tely
Simple merge

diff --cc Documentation/fr/notation.tely
Simple merge

diff --cc Documentation/fr/usage.tely
Simple merge

diff --cc Documentation/fr/web.texi
Simple merge

diff --cc Documentation/hu/learning.tely
Simple merge

diff --cc Documentation/hu/usage.tely
Simple merge

diff --cc Documentation/hu/web.texi
Simple merge

diff --cc Documentation/it/learning.tely
Simple merge

diff --cc Documentation/it/usage.tely
Simple merge

diff --cc Documentation/it/web.texi
Simple merge

diff --cc Documentation/ja/learning.tely
Simple merge

diff --cc Documentation/ja/notation.tely
Simple merge

diff --cc Documentation/ja/usage.tely
Simple merge

diff --cc Documentation/learning.tely
Simple merge

diff --cc Documentation/music-glossary.tely
Simple merge

diff --cc Documentation/nl/learning.tely
Simple merge

diff --cc Documentation/notation.tely
Simple merge

diff --cc Documentation/snippets.tely
Simple merge

diff --cc Documentation/usage.tely
Simple merge

diff --cc Documentation/web.texi
Simple merge

diff --cc lily/midi-stream.cc
Simple merge

diff --cc lily/piano-pedal-engraver.cc
Simple merge

diff --cc lily/prob.cc
Simple merge

diff --cc lily/relocate.cc
index e5f38d1f90d3d1fd8837c372aed545d89994b94d,0d600820ae0fa977029b7e439aaae2a4ba86c9e6..2f314f1063dd959ff43d60648fdb851e1505af01
--- 1/lily/relocate.cc
--- 2/lily/relocate.cc
+++ b/lily/relocate.cc
@@@ -21,13 -21,10 +21,12 @@@
  
  #include "config.hh"
  
- 
  /* TODO: autoconf support */
  
 +#include <ctype.h>
  #include <sys/types.h>
  #include <dirent.h>
 +#include <cstring>
  
  #if HAVE_GETTEXT
  #include <libintl.h>

diff --cc lily/source-file.cc
Simple merge

diff --cc lily/translator.cc
Simple merge

diff --cc scm/lily.scm
Simple merge

diff --cc scm/ps-to-png.scm
Simple merge