Merge in 'secure-delete'.