Merge branch 'dm6'
-rwxr-xr-x 34366 dm6
-rwxr-xr-x 50183 faster-dupemerge