Merge.

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

svn path=; revision=45745