[FYI] Merged maint into master and branch-1.11

[Stefano Lattarini]

I merged latest maint into master and branch-1.11, and pushed.

Regards,
  Stefano