[FYI] 'master' merged into 'test-protocols'

[Stefano Lattarini]

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

Regards,
  Stefano