Merging recent changes from trunk.

[SVN r85636]
Disabled demangling to break the dependency Exception -> Units -> Algorithms -> Range -> Concepts.

[SVN r85783]