Convenience pull-request to merge tm-import into an earlier version of itself.

This makes it much easier to review what has changed since the last review.