Merge commit 'origin' into includes

diff --combined scm/lily.scm
index 2c1eb188e69054341b91df7db63b1c33cb30bd12,900c347c26aefd9abf303a6a8812e1a7143e505c..086d80f09f4d2b3e86e8438d4311a7d352002dc6
--- 1/scm/lily.scm
--- 2/scm/lily.scm
+++ b/scm/lily.scm
@@@ -80,8 -80,6 +80,8 @@@ on errors, and print a stack trace."
      
      (resolution 101 "resolution for generating PNG bitmaps")
      (read-file-list #f "Read files to be processed from command line arguments")
 +    (relative-includes #f "When processing an \\include command, look for the included file
 +relative to the current file (instead of the root file)")
  
      (safe #f "Run safely")
      (strict-infinity-checking #f "If yes, crash on encountering Inf/NaN.")
@@@ -89,8 -87,6 +89,6 @@@
      (separate-log-files #f "Output to FILE.log per file.")
      (trace-memory-frequency #f "Record Scheme cell usage this many times per second, and dump to file.")
      (trace-scheme-coverage #f "Record coverage of Scheme files") 
-     (ttf-verbosity 0
-                  "how much verbosity for TTF font embedding?")
      (show-available-fonts #f
                          "List font names available.")
      (verbose ,(ly:command-line-verbose?) "value for the --verbose flag")