Changes to unix

Changes to unix:
commit 88bfec0cf55f8c9ad74881d48cf8756c9fe627aa
Author: Herbert Valerio Riedel <hvr@gnu.org>
Date:   Thu Nov 7 10:21:17 2013 +0100

    Temporary workaround for addressing #7359

    Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>