Jordi Boggiano b89720b52a Merge branch 'master' into 2.0 6 lat temu
..
Test b89720b52a Merge branch 'master' into 2.0 6 lat temu