Just a merge branch, to prepare for gsync-libc