ENH: Merge changes from main tree into VTK-5-0 branch. (cvs -q up -j1.15 -j1.16 Graphics/Testing/Cxx/Mace.cxx)