Merge 84443 from trunk, to fix mpl assert failures for msvc in many libraries.

[SVN r86514]