Jordi Boggiano 97e2a249e8 Merge branch 'master' into 2.0 5 gadi atpakaļ
..
Test 97e2a249e8 Merge branch 'master' into 2.0 5 gadi atpakaļ