Merging while preserving the dxs history.

Santi and/or Miguel, could you please review and comment on this before this is merged. I don't want to be the one to screw things up :-)