Merge fuzzbot branch into master