Merge commit '5b7632331e7551ac202bbaba37c572b96a791c6e'

Conflicts:
	module/oop/goops.scm

diff --cc module/oop/goops.scm
index 6afd049,9ab1eb2..95be42a
--- 1/module/oop/goops.scm
--- 2/module/oop/goops.scm
+++ b/module/oop/goops.scm
@@@ -1,6 -1,6 +1,6 @@@
  ;;; installed-scm-file
  
- ;;;; Copyright (C) 1998,1999,2000,2001,2002, 2003, 2006, 2009, 2010, 2011, 2013, 2014, 2015 Free Software Foundation, Inc.
 -;;;; Copyright (C) 1998,1999,2000,2001,2002, 2003, 2006, 2009, 2010, 2011, 2014, 2015 Free Software Foundation, Inc.
++;;;; Copyright (C) 1998,1999,2000-2003,2006,2009-2011,2013-2015 Free Software Foundation, Inc.
  ;;;; Copyright (C) 1993-1998 Erick Gallesio - I3S-CNRS/ESSI <eg@unice.fr>
  ;;;;
  ;;;; This library is free software; you can redistribute it and/or