Jordi Boggiano 7e6fe585bc Merge branch 'master' into 2.0 5 gadi atpakaļ
..
Test 7e6fe585bc Merge branch 'master' into 2.0 5 gadi atpakaļ