Merge 'fixes' branch.

No match.