Merge branch 'master' of git.einval.com:strace-test