Conflicts: src/plugins/assetimporters/assetimporters.pro Change-Id: Ifbb130cddbd4ed67cb2b63c7a6c5ad49924ced05