Merge in 'samdump2'.