... applied mainline and branch this follow-up, see audit-trail for details.

Tested x86_64-linux.

Paolo.

PS: Jon, looks like we are missing some constraining in the templated 
constructor and and assignment operator of the unique_ptr specialization?

////////////////