Merge commit '5af307de43e4b65eec7f235b48a8908f2a00f134'

Conflicts:
	test-suite/tests/reader.test

diff --cc doc/ref/api-data.texi
Simple merge

diff --cc libguile/read.c
Simple merge

diff --cc test-suite/tests/reader.test
index d9cb1c8,9055e3b..5eb368d
--- 1/test-suite/tests/reader.test
--- 2/test-suite/tests/reader.test
+++ b/test-suite/tests/reader.test
@@@ -1,7 -1,8 +1,8 @@@
  ;;;; reader.test --- Reader test.    -*- coding: iso-8859-1; mode: scheme -*-
  ;;;;
- ;;;; Copyright (C) 1999, 2001, 2002, 2003, 2007, 2008, 2009, 2010, 2011,
- ;;;;   2013, 2014 Free Software Foundation, Inc.
 -;;;; Copyright (C) 1999, 2001-2003, 2007-2011, 2014
++;;;; Copyright (C) 1999, 2001-2003, 2007-2011, 2013-2015
+ ;;;;   Free Software Foundation, Inc.
+ ;;;;
  ;;;; Jim Blandy <jimb@red-bean.com>
  ;;;;
  ;;;; This library is free software; you can redistribute it and/or