Jordi Boggiano a5b178084c Merge branch 'master' into 2.0 6 rokov pred
..
Test a5b178084c Merge branch 'master' into 2.0 6 rokov pred