Marcus Da Coregio bb6fc88875 Merge branch '6.0.x' 2 lat temu
..
login-logout bb6fc88875 Merge branch '6.0.x' 2 lat temu