Merge branch 'b-dev' of C:\htdocs\github\oxideshop with conflicts.
0005165: Image heredity of variant pictures is wrong