Merge in 'skipfish'.