[FYI] various merges

[Stefano Lattarini]

I've merged maint into master, master into testsuite-work and
test-protocols, and pushed.

Regards,
  Stefano