Merge topic 'tll-new-signatures' into next manually to remove duplicate

Merge commit c8e807b5 (Merge topic 'tll-new-signatures' into next,
2013-07-24) merged two versions of the same change that happened to have
context allowing both copies to be added.  The result does not represent
what would happen when a single version of the tll-new-signatures topic
is merged to a branch that does not yet have it.  Manually remove the
extra copy.