Merge commit '1e3fd6a0c81bb3e9900a93a9d1923cc788de0f99'

Conflicts:
	doc/ref/api-memory.texi
	libguile/weaks.c
	libguile/weaks.h
	module/ice-9/weak-vector.scm

diff --cc doc/ref/api-memory.texi
index 6512650,8d0c8fe..130ff84
--- 1/doc/ref/api-memory.texi
--- 2/doc/ref/api-memory.texi
+++ b/doc/ref/api-memory.texi
@@@ -1,6 -1,6 +1,6 @@@
  @c -*-texinfo-*-
  @c This is part of the GNU Guile Reference Manual.
- @c Copyright (C)  1996, 1997, 2000, 2001, 2002, 2003, 2004, 2009, 2010, 2012, 2013
 -@c Copyright (C)  1996, 1997, 2000, 2001, 2002, 2003, 2004, 2009, 2010, 2012, 2014
++@c Copyright (C)  1996, 1997, 2000, 2001, 2002, 2003, 2004, 2009, 2010, 2012, 2013, 2014
  @c   Free Software Foundation, Inc.
  @c See the file guile.texi for copying conditions.