Merge commit 'origin' into release/unstable

diff --combined scm/lily.scm
index 55d331fd82b68e27389017c9cf77d7ec7068e22e,a17d6f03b215e34951d55847562f6616ad8c3ae5..c680b0ff0a4859fcc75bd9de94697d9546e398ac
--- 1/scm/lily.scm
--- 2/scm/lily.scm
+++ b/scm/lily.scm
@@@ -254,10 -254,7 +254,7 @@@ messages into errors."
  (if (memq (ly:get-option 'backend) music-string-to-path-backends)
      (ly:set-option 'music-strings-to-paths #t))
  
- ;; gettext wrapper for guile < 1.7.2
- (if (defined? 'gettext)
-     (define-public _ gettext)
-     (define-public _ ly:gettext))
+ (define-public _ gettext)
  
  (define-public (ly:load x)
    (let* ((file-name (%search-load-path x)))
@@@ -729,7 -726,8 +726,7 @@@ PIDs or the number of the process.
         (ly:set-option 'debug-gc-assert-parsed-dead #f)
         (if (ly:get-option 'debug-gc)
             (dump-gc-protects)
 -           (if (= (random 40) 1)
 -               (ly:reset-all-fonts)))))
 +           (ly:reset-all-fonts))))
       files)
  
      ;; we want the failed-files notice in the aggregrate logfile.