Merge branch 'master' of /home/git/random-fuzzer into thread-switch