Fix merge issue of commit 5dba48d1be0631dd5cdab678b3040a780eef891b
Fix merge issue of commit 5dba48d1be0631dd5cdab678b3040a780eef891b

oktupol/shopware,jhit/shopware,jhit/shopware,k10r/shopware,Pttde/shopware,Pttde/shopware,JonidBendo/shopware,giginos/shopware,DerRidda/shopware,egoistIT/shopware,NetInventors/shopware,mreiss/shopware,jochenmanz/shopware,mreiss/shopware,simkli/shopware,k10r/shopware,giginos/shopware,giginos/shopware,wolv-dev/shopware,s-haase/shopware,egoistIT/shopware,wesolowski/shopware,VIISON/shopware-4,VIISON/shopware-4,simkli/shopware,k10r/shopware,philippmahlow/shopware,wolv-dev/shopware,philippmahlow/shopware,NetInventors/shopware,oktupol/shopware,Pttde/shopware,NetInventors/shopware,s-haase/shopware,s-haase/shopware,simkli/shopware,Pttde/shopware,philippmahlow/shopware,JonidBendo/shopware,bcremer/shopware,simkli/shopware,egoistIT/shopware,arvatis/shopware,JonidBendo/shopware,wesolowski/shopware,NetInventors/shopware,oktupol/shopware,wolv-dev/shopware,VIISON/shopware-4,NetInventors/shopware,oktupol/shopware,philippmahlow/shopware,s-haase/shopware,JonidBendo/shopware,DerRidda/shopware,wesolowski/shopware,DerRidda/shopware,k10r/shopware,JonidBendo/shopware,jochenmanz/shopware,jochenmanz/shopware,arvatis/shopware,wesolowski/shopware,VIISON/shopware-4,DerRidda/shopware,VIISON/shopware-4,Pttde/shopware,bcremer/shopware,wolv-dev/shopware,simkli/shopware,bcremer/shopware,wolv-dev/shopware,mreiss/shopware,jhit/shopware,bcremer/shopware,mreiss/shopware,arvatis/shopware,egoistIT/shopware,arvatis/shopware,k10r/shopware,oktupol/shopware,jochenmanz/shopware,bcremer/shopware,giginos/shopware,DerRidda/shopware,mreiss/shopware,wesolowski/shopware,jhit/shopware,philippmahlow/shopware,egoistIT/shopware,jochenmanz/shopware,s-haase/shopware,jhit/shopware,giginos/shopware,arvatis/shopware