Merged mf.* from SVN head (which implements damping)...