Willy-JL 311b0a9c74 Fix merge 3 gadi atpakaļ
..
magspoof 311b0a9c74 Fix merge 3 gadi atpakaļ