Move the unordered library into 'branches' now that it has been accepted.
Merge.
Fix some merge errors.