Marcus Da Coregio bb6fc88875 Merge branch '6.0.x' 2 lat temu
..
username-password bb6fc88875 Merge branch '6.0.x' 2 lat temu
x509 bb6fc88875 Merge branch '6.0.x' 2 lat temu