Merge.

svn path=; revision=42408
Fix some merge errors.

svn path=; revision=42409
Remove the unordered/refactor branch as it's long abandoned.

svn path=; revision=45745