ALL: Merge the win32-contrib branch.