upstream/6.12+dfsg1

David Bremner

@bremner

765640c9 · Merge branch 'upstream' into dfsg · Feb 02, 2018

merge changes from 6.12

leave non-free srfi related stuff deleted