Merge branch 'b-5.0' of C:\htdocs\oxideshop_5_0 with conflicts.