This commit was manufactured by cvs2svn to create branch
'unlabeled-1.14.2'.
More cleanups for mpl_v2