Merge commit 'ed72201a795ac1c8d6c0288b6bb710f2bd0ebd9c'

Conflicts:
	test-suite/tests/r6rs-ports.test

diff --cc libguile/r6rs-ports.c
Simple merge

diff --cc module/ice-9/command-line.scm
Simple merge

diff --cc test-suite/tests/r6rs-ports.test
index 17acdc4,e5f1266..dd40925
--- 1/test-suite/tests/r6rs-ports.test
--- 2/test-suite/tests/r6rs-ports.test
+++ b/test-suite/tests/r6rs-ports.test
@@@ -1,7 -1,6 +1,6 @@@
  ;;;; r6rs-ports.test --- R6RS I/O port tests.   -*- coding: utf-8; -*-
  ;;;;
- ;;;; Copyright (C) 2009, 2010, 2011, 2012, 2013,
- ;;;;   2014 Free Software Foundation, Inc.
 -;;;; Copyright (C) 2009-2012, 2014-2015 Free Software Foundation, Inc.
++;;;; Copyright (C) 2009-2012, 2013-2015 Free Software Foundation, Inc.
  ;;;; Ludovic Courtès
  ;;;;
  ;;;; This library is free software; you can redistribute it and/or