Merge branch 'master' of git://git.etalabs.net/musl