Merge in 'sfuzz'.